diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/smc91x.h | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (diff) |
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer.
wireless, wimax, ixgbe, etc are not modified.
Compile tested x86 allyesconfig only
Not all files compiled (not x86 compatible)
Added a few > 80 column lines, which I ignored.
Existing checkpatch complaints ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smc91x.h')
-rw-r--r-- | drivers/net/smc91x.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 3911be7c0cba..7815bfc300f5 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -158,8 +158,8 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
158 | #define SMC_outsb(a, r, p, l) writesb((a) + (r), p, (l)) | 158 | #define SMC_outsb(a, r, p, l) writesb((a) + (r), p, (l)) |
159 | #define SMC_IRQ_FLAGS (-1) /* from resource */ | 159 | #define SMC_IRQ_FLAGS (-1) /* from resource */ |
160 | 160 | ||
161 | #elif defined(CONFIG_MACH_LOGICPD_PXA270) \ | 161 | #elif defined(CONFIG_MACH_LOGICPD_PXA270) || \ |
162 | || defined(CONFIG_MACH_NOMADIK_8815NHK) | 162 | defined(CONFIG_MACH_NOMADIK_8815NHK) |
163 | 163 | ||
164 | #define SMC_CAN_USE_8BIT 0 | 164 | #define SMC_CAN_USE_8BIT 0 |
165 | #define SMC_CAN_USE_16BIT 1 | 165 | #define SMC_CAN_USE_16BIT 1 |
@@ -258,9 +258,9 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
258 | #define RPC_LSA_DEFAULT RPC_LED_TX_RX | 258 | #define RPC_LSA_DEFAULT RPC_LED_TX_RX |
259 | #define RPC_LSB_DEFAULT RPC_LED_100_10 | 259 | #define RPC_LSB_DEFAULT RPC_LED_100_10 |
260 | 260 | ||
261 | #elif defined(CONFIG_MACH_LPD79520) \ | 261 | #elif defined(CONFIG_MACH_LPD79520) || \ |
262 | || defined(CONFIG_MACH_LPD7A400) \ | 262 | defined(CONFIG_MACH_LPD7A400) || \ |
263 | || defined(CONFIG_MACH_LPD7A404) | 263 | defined(CONFIG_MACH_LPD7A404) |
264 | 264 | ||
265 | /* The LPD7X_IOBARRIER is necessary to overcome a mismatch between the | 265 | /* The LPD7X_IOBARRIER is necessary to overcome a mismatch between the |
266 | * way that the CPU handles chip selects and the way that the SMC chip | 266 | * way that the CPU handles chip selects and the way that the SMC chip |