diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 13:01:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 13:01:49 -0400 |
| commit | d848223808c5d21e1b3cea090047e34722c6254b (patch) | |
| tree | a869974378be9c20f311ad3d934eb3946e813a1a /drivers | |
| parent | 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (diff) | |
| parent | 2f2a2132ff056bb45697dc855eb4fd95b70b38cb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
Separate out the proc- and unit-specific header directories from the general
Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
Diffstat (limited to 'drivers')
| -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 | ||