summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-10 19:01:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-10 19:01:49 +0200
commitd848223808c5d21e1b3cea090047e34722c6254b (patch)
treea869974378be9c20f311ad3d934eb3946e813a1a /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv (diff)
parentSeparate out the proc- and unit-specific header directories from the general (diff)
downloadlinux-d848223808c5d21e1b3cea090047e34722c6254b.tar.xz
linux-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.h2
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,
* MN10300/AM33 configuration
*/
-#include <asm/unit/smc91111.h>
+#include <unit/smc91111.h>
#else