Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c43eaa02 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1d0ed384

arch/i386/mach-visws/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ static __init void lithium_init(void) 
	set_fixmap(FIX_LI_PCIB, LI_PCI_B_PHYS);



	if ((li_pcia_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) ||

	    (li_pcia_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) {

	    (li_pcia_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) {

		printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'A');

		panic("This machine is not SGI Visual Workstation 320/540");

	}



	if ((li_pcib_read16(PCI_VENDOR_ID) != PCI_VENDOR_ID_SGI) ||

	    (li_pcib_read16(PCI_DEVICE_ID) != PCI_VENDOR_ID_SGI_LITHIUM)) {

	    (li_pcib_read16(PCI_DEVICE_ID) != PCI_DEVICE_ID_SGI_LITHIUM)) {

		printk(KERN_EMERG "Lithium hostbridge %c not found\n", 'B');

		panic("This machine is not SGI Visual Workstation 320/540");

	}

include/linux/pci_ids.h

+1 −1
Original line number Diff line number Diff line
@@ -944,8 +944,8 @@ 


#define PCI_VENDOR_ID_SGI		0x10a9

#define PCI_DEVICE_ID_SGI_IOC3		0x0003

#define PCI_DEVICE_ID_SGI_LITHIUM	0x1002

#define PCI_DEVICE_ID_SGI_IOC4		0x100a

#define PCI_VENDOR_ID_SGI_LITHIUM	0x1002





#define PCI_VENDOR_ID_WINBOND		0x10ad