From 3084f0c6105a71e43225c36b4d97c1407988a242 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 27 Sep 2007 06:25:06 -0400 Subject: [PATCH] drivers/block/umem: move private include away from include/linux Move include/linux/umem.h to drivers/block, as umem.c is the only user, and its not an exported header. Move the PCI_{VENDOR,DEVICE}_ID_* constants to include/linux/pci_ids.h. Signed-off-by: Jeff Garzik --- drivers/block/umem.c | 2 +- {include/linux => drivers/block}/umem.h | 5 ----- include/linux/pci_ids.h | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) rename {include/linux => drivers/block}/umem.h (95%) diff --git a/drivers/block/umem.c b/drivers/block/umem.c index be7fac86725e..33ef7661e1c1 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -52,7 +52,7 @@ #include /* O_ACCMODE */ #include /* HDIO_GETGEO */ -#include +#include "umem.h" #include #include diff --git a/include/linux/umem.h b/drivers/block/umem.h similarity index 95% rename from include/linux/umem.h rename to drivers/block/umem.h index f36ebfc32bf6..3a3819afed92 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 55f307ffbf96..506b9ae241fd 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