From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 27 Sep 2007 10:25:06 +0000 (-0400)
Subject: drivers/block/umem: move private include away from include/linux
X-Git-Tag: v2.6.24-rc1~1460^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3084f0c6105a71e43225c36b4d97c1407988a242;p=linux-2.6

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 <jeff@garzik.org>
---

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index be7fac8672..33ef7661e1 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
similarity index 95%
rename from include/linux/umem.h
rename to drivers/block/umem.h
index f36ebfc32b..3a3819afed 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 55f307ffbf..506b9ae241 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