diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /drivers/net/smc91x.h | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/net/smc91x.h')
| -rw-r--r-- | drivers/net/smc91x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 912308eec865..329f890e2903 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
| @@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, | |||
| 369 | * MN10300/AM33 configuration | 369 | * MN10300/AM33 configuration |
| 370 | */ | 370 | */ |
| 371 | 371 | ||
| 372 | #include <asm/unit/smc91111.h> | 372 | #include <unit/smc91111.h> |
| 373 | 373 | ||
| 374 | #else | 374 | #else |
| 375 | 375 | ||