[PATCH] fix several bogus includes on mn10300 abs2305

From: Al Viro
Date: Wed Dec 17 2008 - 11:50:25 EST


asm/cpu never existed for mn10300; the files they are looking for are in
asm.

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
arch/mn10300/unit-asb2305/leds.c | 4 ++--
arch/mn10300/unit-asb2305/unit-init.c | 6 +++---
arch/mn10300/unit-asb2305/unit/serial.h | 2 +-
arch/mn10300/unit-asb2305/unit/timex.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/mn10300/unit-asb2305/leds.c b/arch/mn10300/unit-asb2305/leds.c
index d345ff9..6f8de99 100644
--- a/arch/mn10300/unit-asb2305/leds.c
+++ b/arch/mn10300/unit-asb2305/leds.c
@@ -13,8 +13,8 @@
#include <linux/init.h>
#include <asm/io.h>
#include <asm/processor.h>
-#include <asm/cpu/intctl-regs.h>
-#include <asm/cpu/rtc-regs.h>
+#include <asm/intctl-regs.h>
+#include <asm/rtc-regs.h>
#include <unit/leds.h>

static const u8 asb2305_led_hex_tbl[16] = {
diff --git a/arch/mn10300/unit-asb2305/unit-init.c b/arch/mn10300/unit-asb2305/unit-init.c
index 1c452cc..3d78ae5 100644
--- a/arch/mn10300/unit-asb2305/unit-init.c
+++ b/arch/mn10300/unit-asb2305/unit-init.c
@@ -15,9 +15,9 @@
#include <asm/io.h>
#include <asm/setup.h>
#include <asm/processor.h>
-#include <asm/cpu/intctl-regs.h>
-#include <asm/cpu/rtc-regs.h>
-#include <asm/cpu/serial-regs.h>
+#include <asm/intctl-regs.h>
+#include <asm/rtc-regs.h>
+#include <asm/serial-regs.h>
#include <unit/serial.h>

/*
diff --git a/arch/mn10300/unit-asb2305/unit/serial.h b/arch/mn10300/unit-asb2305/unit/serial.h
index 3bfc909..8086cc0 100644
--- a/arch/mn10300/unit-asb2305/unit/serial.h
+++ b/arch/mn10300/unit-asb2305/unit/serial.h
@@ -11,7 +11,7 @@
#ifndef _ASM_UNIT_SERIAL_H
#define _ASM_UNIT_SERIAL_H

-#include <asm/cpu/cpu-regs.h>
+#include <asm/cpu-regs.h>
#include <proc/irq.h>
#include <linux/serial_reg.h>

diff --git a/arch/mn10300/unit-asb2305/unit/timex.h b/arch/mn10300/unit-asb2305/unit/timex.h
index a71c49a..d1c72d5 100644
--- a/arch/mn10300/unit-asb2305/unit/timex.h
+++ b/arch/mn10300/unit-asb2305/unit/timex.h
@@ -15,7 +15,7 @@
#include <linux/irq.h>
#endif /* __ASSEMBLY__ */

-#include <asm/cpu/timer-regs.h>
+#include <asm/timer-regs.h>
#include <unit/clock.h>

/*
--
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/