diff options
Diffstat (limited to 'arch/mips/vr41xx/nec-cmbvr4133')
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/init.c | 6 | ||||
-rw-r--r-- | arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c index ae1af6b21c45..7c5e18ee2231 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/init.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/init.c | |||
@@ -36,7 +36,7 @@ void disable_pcnet(void) | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | writel((2 << 16) | | 38 | writel((2 << 16) | |
39 | (PCI_DEVFN(1,0) << 8) | | 39 | (PCI_DEVFN(1, 0) << 8) | |
40 | (0 & 0xfc) | | 40 | (0 & 0xfc) | |
41 | 1UL, | 41 | 1UL, |
42 | PCICONFAREG); | 42 | PCICONFAREG); |
@@ -44,7 +44,7 @@ void disable_pcnet(void) | |||
44 | data = readl(PCICONFDREG); | 44 | data = readl(PCICONFDREG); |
45 | 45 | ||
46 | writel((2 << 16) | | 46 | writel((2 << 16) | |
47 | (PCI_DEVFN(1,0) << 8) | | 47 | (PCI_DEVFN(1, 0) << 8) | |
48 | (4 & 0xfc) | | 48 | (4 & 0xfc) | |
49 | 1UL, | 49 | 1UL, |
50 | PCICONFAREG); | 50 | PCICONFAREG); |
@@ -52,7 +52,7 @@ void disable_pcnet(void) | |||
52 | data = readl(PCICONFDREG); | 52 | data = readl(PCICONFDREG); |
53 | 53 | ||
54 | writel((2 << 16) | | 54 | writel((2 << 16) | |
55 | (PCI_DEVFN(1,0) << 8) | | 55 | (PCI_DEVFN(1, 0) << 8) | |
56 | (4 & 0xfc) | | 56 | (4 & 0xfc) | |
57 | 1UL, | 57 | 1UL, |
58 | PCICONFAREG); | 58 | PCICONFAREG); |
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c index f45caccedc07..1341f3287d04 100644 --- a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c +++ b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c | |||
@@ -38,7 +38,7 @@ | |||
38 | outb_p((dev_no), DATA_PORT(port)); \ | 38 | outb_p((dev_no), DATA_PORT(port)); \ |
39 | } while(0) | 39 | } while(0) |
40 | 40 | ||
41 | #define WRITE_CONFIG_DATA(port,index,data) \ | 41 | #define WRITE_CONFIG_DATA(port, index, data) \ |
42 | do { \ | 42 | do { \ |
43 | outb_p((index), INDEX_PORT(port)); \ | 43 | outb_p((index), INDEX_PORT(port)); \ |
44 | outb_p((data), DATA_PORT(port)); \ | 44 | outb_p((data), DATA_PORT(port)); \ |
@@ -206,8 +206,8 @@ static inline u16 ali_config_readw(u8 reg, int devfn) | |||
206 | int vr4133_rockhopper = 0; | 206 | int vr4133_rockhopper = 0; |
207 | void __init ali_m5229_preinit(void) | 207 | void __init ali_m5229_preinit(void) |
208 | { | 208 | { |
209 | if (ali_config_readw(PCI_VENDOR_ID,16) == PCI_VENDOR_ID_AL && | 209 | if (ali_config_readw(PCI_VENDOR_ID, 16) == PCI_VENDOR_ID_AL && |
210 | ali_config_readw(PCI_DEVICE_ID,16) == PCI_DEVICE_ID_AL_M1533) { | 210 | ali_config_readw(PCI_DEVICE_ID, 16) == PCI_DEVICE_ID_AL_M1533) { |
211 | printk(KERN_INFO "Found an NEC Rockhopper \n"); | 211 | printk(KERN_INFO "Found an NEC Rockhopper \n"); |
212 | vr4133_rockhopper = 1; | 212 | vr4133_rockhopper = 1; |
213 | /* | 213 | /* |