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 /arch/mn10300/unit-asb2303/smc91111.c | |
| 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 'arch/mn10300/unit-asb2303/smc91111.c')
| -rw-r--r-- | arch/mn10300/unit-asb2303/smc91111.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/unit-asb2303/smc91111.c b/arch/mn10300/unit-asb2303/smc91111.c index 30875dd65631..43c246439413 100644 --- a/arch/mn10300/unit-asb2303/smc91111.c +++ b/arch/mn10300/unit-asb2303/smc91111.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <asm/timex.h> | 18 | #include <asm/timex.h> |
| 19 | #include <asm/processor.h> | 19 | #include <asm/processor.h> |
| 20 | #include <asm/intctl-regs.h> | 20 | #include <asm/intctl-regs.h> |
| 21 | #include <asm/unit/smc91111.h> | 21 | #include <unit/smc91111.h> |
| 22 | 22 | ||
| 23 | static struct resource smc91c111_resources[] = { | 23 | static struct resource smc91c111_resources[] = { |
| 24 | [0] = { | 24 | [0] = { |