lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'origin' into devel

Browse Source 
Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c
This commit is contained in:
Russell King
2009-03-28 20:29:51 +00:00
committed by Russell King
parent 9e495834e5 5d80f8e5a9
commit ed40d0c472
3099 changed files with 224252 additions and 127768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/smc91x.h
View File

@@ -1140,6 +1140,16 @@ static const char * chip_ids[ 16 ] = {
#define SMC_GET_MII(lp) SMC_inw(ioaddr, MII_REG(lp))
#define SMC_GET_GP(lp) SMC_inw(ioaddr, GP_REG(lp))
#define SMC_SET_GP(lp, x) \
do { \
if (SMC_MUST_ALIGN_WRITE(lp)) \
SMC_outl((x)<<16, ioaddr, SMC_REG(lp, 8, 1)); \
else \
SMC_outw(x, ioaddr, GP_REG(lp)); \
} while (0)
#define SMC_SET_MII(lp, x) SMC_outw(x, ioaddr, MII_REG(lp))
#define SMC_GET_MIR(lp) SMC_inw(ioaddr, MIR_REG(lp))