diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-06-18 04:58:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-11 19:02:10 -0400 |
commit | c43eaa02abf3b034a9694dcca5c177ecb6072f89 (patch) | |
tree | bf2903178339210be4a705aa00ed93e01723787e | |
parent | 1d0ed384c1f2582b6f7408642c77a78a0c410122 (diff) |
PCI: i386: traps, change VENDOR to DEVICE
traps, change VENDOR to DEVICE
Change macro for SGI lithium (arch/i386/mach-visws/traps.c) device from
VENDOR to DEVICE, because it's a device id.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/i386/mach-visws/traps.c | 4 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/mach-visws/traps.c b/arch/i386/mach-visws/traps.c index 5199bd03254a..843b67acf43b 100644 --- a/arch/i386/mach-visws/traps.c +++ b/arch/i386/mach-visws/traps.c | |||
@@ -23,13 +23,13 @@ static __init void lithium_init(void) | |||
23 | set_fixmap(FIX_LI_PCIB, LI_PCI_B_PHYS); | 23 | set_fixmap(FIX_LI_PCIB, LI_PCI_B_PHYS); |
24 | 24 | ||
25 | if ((li_pcia_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) || | 25 | if ((li_pcia_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) || |
26 | (li_pcia_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) { | 26 | (li_pcia_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) { |
27 | printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'A'); | 27 | printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'A'); |
28 | panic("This machine is not SGI Visual Workstation 320/540"); | 28 | panic("This machine is not SGI Visual Workstation 320/540"); |
29 | } | 29 | } |
30 | 30 | ||
31 | if ((li_pcib_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) || | 31 | if ((li_pcib_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) || |
32 | (li_pcib_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) { | 32 | (li_pcib_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) { |
33 | printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'B'); | 33 | printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'B'); |
34 | panic("This machine is not SGI Visual Workstation 320/540"); | 34 | panic("This machine is not SGI Visual Workstation 320/540"); |
35 | } | 35 | } |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index a260a947c917..228e0befeda1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -944,8 +944,8 @@ | |||
944 | 944 | ||
945 | #define PCI_VENDOR_ID_SGI 0x10a9 | 945 | #define PCI_VENDOR_ID_SGI 0x10a9 |
946 | #define PCI_DEVICE_ID_SGI_IOC3 0x0003 | 946 | #define PCI_DEVICE_ID_SGI_IOC3 0x0003 |
947 | #define PCI_DEVICE_ID_SGI_LITHIUM 0x1002 | ||
947 | #define PCI_DEVICE_ID_SGI_IOC4 0x100a | 948 | #define PCI_DEVICE_ID_SGI_IOC4 0x100a |
948 | #define PCI_VENDOR_ID_SGI_LITHIUM 0x1002 | ||
949 | 949 | ||
950 | 950 | ||
951 | #define PCI_VENDOR_ID_WINBOND 0x10ad | 951 | #define PCI_VENDOR_ID_WINBOND 0x10ad |