sh: pci: Move Renesas PCI IDs to a better place.

Previously these IDs were only used by one driver, so there was not much
need for having them generically defined. Now that this will no longer
hold true, move them over.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h
index 205dcbe..1742e2c 100644 (file)
--- a/arch/sh/drivers/pci/pci-sh7780.h
+++ b/arch/sh/drivers/pci/pci-sh7780.h
@@ -12,12 +12,6 @@
 #ifndef _PCI_SH7780_H_
 #define _PCI_SH7780_H_
 
-#define PCI_VENDOR_ID_RENESAS          0x1912
-#define PCI_DEVICE_ID_RENESAS_SH7781   0x0001
-#define PCI_DEVICE_ID_RENESAS_SH7780   0x0002
-#define PCI_DEVICE_ID_RENESAS_SH7763   0x0004
-#define PCI_DEVICE_ID_RENESAS_SH7785   0x0007
-
 /* SH7780 Control Registers */
 #define        PCIECR                  0xFE000008
 #define PCIECR_ENBL            0x01

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f6a3b2d..33a5d1c 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2260,6 +2260,13 @@
 
 #define PCI_VENDOR_ID_SILAN            0x1904
 
+#define PCI_VENDOR_ID_RENESAS          0x1912
+#define PCI_DEVICE_ID_RENESAS_SH7781   0x0001
+#define PCI_DEVICE_ID_RENESAS_SH7780   0x0002
+#define PCI_DEVICE_ID_RENESAS_SH7763   0x0004
+#define PCI_DEVICE_ID_RENESAS_SH7785   0x0007
+#define PCI_DEVICE_ID_RENESAS_SH7786   0x0010
+
 #define PCI_VENDOR_ID_TDI               0x192E
 #define PCI_DEVICE_ID_TDI_EHCI          0x0101