diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/mn10300/unit-asb2305/unit-init.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/mn10300/unit-asb2305/unit-init.c')
| -rw-r--r-- | arch/mn10300/unit-asb2305/unit-init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mn10300/unit-asb2305/unit-init.c b/arch/mn10300/unit-asb2305/unit-init.c index 1c452cc3f6e..a76c8e0ab90 100644 --- a/arch/mn10300/unit-asb2305/unit-init.c +++ b/arch/mn10300/unit-asb2305/unit-init.c | |||
| @@ -15,9 +15,8 @@ | |||
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include <asm/setup.h> | 16 | #include <asm/setup.h> |
| 17 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 18 | #include <asm/cpu/intctl-regs.h> | 18 | #include <asm/intctl-regs.h> |
| 19 | #include <asm/cpu/rtc-regs.h> | 19 | #include <asm/serial-regs.h> |
| 20 | #include <asm/cpu/serial-regs.h> | ||
| 21 | #include <unit/serial.h> | 20 | #include <unit/serial.h> |
| 22 | 21 | ||
| 23 | /* | 22 | /* |