diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/mips/pci/pci-sb1250.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/mips/pci/pci-sb1250.c')
| -rw-r--r-- | arch/mips/pci/pci-sb1250.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index bf639590b8b2..ada24e6f951f 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
| @@ -58,7 +58,7 @@ static void *cfg_space; | |||
| 58 | #define LDT_BUS_ENABLED 2 | 58 | #define LDT_BUS_ENABLED 2 |
| 59 | #define PCI_DEVICE_MODE 4 | 59 | #define PCI_DEVICE_MODE 4 |
| 60 | 60 | ||
| 61 | static int sb1250_bus_status = 0; | 61 | static int sb1250_bus_status; |
| 62 | 62 | ||
| 63 | #define PCI_BRIDGE_DEVICE 0 | 63 | #define PCI_BRIDGE_DEVICE 0 |
| 64 | #define LDT_BRIDGE_DEVICE 1 | 64 | #define LDT_BRIDGE_DEVICE 1 |