diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 10:01:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 10:01:49 -0700 |
commit | d848223808c5d21e1b3cea090047e34722c6254b (patch) | |
tree | a869974378be9c20f311ad3d934eb3946e813a1a /drivers | |
parent | 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (diff) | |
parent | 2f2a2132ff056bb45697dc855eb4fd95b70b38cb (diff) | |
download | linux-3.10-d848223808c5d21e1b3cea090047e34722c6254b.tar.gz linux-3.10-d848223808c5d21e1b3cea090047e34722c6254b.tar.bz2 linux-3.10-d848223808c5d21e1b3cea090047e34722c6254b.zip |
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 912308eec86..329f890e290 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, * MN10300/AM33 configuration */ -#include <asm/unit/smc91111.h> +#include <unit/smc91111.h> #else |