projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
[cascardo/linux.git]
/
arch
/
mips
/
pci
/
pci-bcm1480ht.c
diff --git
a/arch/mips/pci/pci-bcm1480ht.c
b/arch/mips/pci/pci-bcm1480ht.c
index
50cc6e9
..
1263c5e
100644
(file)
--- a/
arch/mips/pci/pci-bcm1480ht.c
+++ b/
arch/mips/pci/pci-bcm1480ht.c
@@
-53,8
+53,8
@@
static void *ht_cfg_space;
static void *ht_cfg_space;
-#define PCI_BUS_ENABLED
1
-#define PCI_DEVICE_MODE
2
+#define PCI_BUS_ENABLED 1
+#define PCI_DEVICE_MODE 2
static int bcm1480ht_bus_status;
static int bcm1480ht_bus_status;
@@
-191,7
+191,7
@@
struct pci_controller bcm1480ht_controller = {
.io_resource = &bcm1480ht_io_resource,
.index = 1,
.get_busno = bcm1480ht_pcibios_get_busno,
.io_resource = &bcm1480ht_io_resource,
.index = 1,
.get_busno = bcm1480ht_pcibios_get_busno,
- .io_offset = A_BCM1480_PHYS_HT_IO_MATCH_BYTES,
+ .io_offset = A_BCM1480_PHYS_HT_IO_MATCH_BYTES,
};
static int __init bcm1480ht_pcibios_init(void)
};
static int __init bcm1480ht_pcibios_init(void)