diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-21 18:35:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-21 18:35:26 -0700 |
| commit | ddc4b4774f4311459828e3eed85d5c8682c71584 (patch) | |
| tree | 70febd5a0ea62791708f77a731f6fc1b11546a51 /include/linux | |
| parent | 1de95269788b4a1588ce8221bbd7500f9de4de98 (diff) | |
| parent | df42471d85d64d8f54eeb842ad079cfba7564a11 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/umem.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/umem.h b/include/linux/umem.h index d6e89299de31..2eb1f55644cc 100644 --- a/include/linux/umem.h +++ b/include/linux/umem.h @@ -128,4 +128,11 @@ struct mm_dma_desc { #define PCI_VENDOR_ID_MICRO_MEMORY 0x1332 #define PCI_DEVICE_ID_MICRO_MEMORY_5415CN 0x5415 #define PCI_DEVICE_ID_MICRO_MEMORY_5425CN 0x5425 +#define PCI_DEVICE_ID_MICRO_MEMORY_6155 0x6155 + +/* bits for card->flags */ +#define UM_FLAG_DMA_IN_REGS 1 +#define UM_FLAG_NO_BYTE_STATUS 2 +#define UM_FLAG_NO_BATTREG 4 +#define UM_FLAG_NO_BATT 8 #endif |