diff options
| -rw-r--r-- | drivers/block/umem.c | 2 | ||||
| -rw-r--r-- | drivers/block/umem.h (renamed from include/linux/umem.h) | 5 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index be7fac86725e2..33ef7661e1c18 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -52,7 +52,7 @@ #include <linux/fcntl.h> /* O_ACCMODE */ #include <linux/hdreg.h> /* HDIO_GETGEO */ -#include <linux/umem.h> +#include "umem.h" #include <asm/uaccess.h> #include <asm/io.h> diff --git a/include/linux/umem.h b/drivers/block/umem.h index f36ebfc32bf6d..3a3819afed92d 100644 --- a/include/linux/umem.h +++ b/drivers/block/umem.h @@ -125,11 +125,6 @@ struct mm_dma_desc { __le64 sem_control_bits; } __attribute__((aligned(8))); -#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 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 55f307ffbf96d..506b9ae241fd4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1736,6 +1736,11 @@ #define PCI_VENDOR_ID_RADISYS 0x1331 +#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 + #define PCI_VENDOR_ID_DOMEX 0x134a #define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001 |