rk: move fiq.h from mach-rk30 to plat-rk

diff --git a/arch/arm/mach-rk30/include/mach/fiq.h b/arch/arm/mach-rk30/include/mach/fiq.h
index 1eb5eab9f813740d5b078fcb713a02222cb1deaa..fc0aaa6b5c7e015c3c41f9af73f470f011006fd5 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/fiq.h
+++ b/arch/arm/mach-rk30/include/mach/fiq.h
@@ -1,27 +1,8 @@
-/*
- * Copyright (C) 2010 Google, Inc.
- *
- * Author:
- *     Iliyan Malchev <malchev@google.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
 #ifndef __ASM_ARCH_RK30_FIQ_H
 #define __ASM_ARCH_RK30_FIQ_H
 
-/* enable/disable an interrupt that is an FIQ (safe from FIQ context?) */
-void rk_fiq_enable(int n);
-void rk_fiq_disable(int n);
-void rk_irq_setpending(int irq);
-void rk_irq_clearpending(int irq);
+#include <plat/fiq.h>
+
 void rk30_fiq_init(void);
+
 #endif

diff --git a/arch/arm/plat-rk/include/plat/fiq.h b/arch/arm/plat-rk/include/plat/fiq.h
new file mode 100644 (file)
index 0000000..9c9261a
--- /dev/null
+++ b/arch/arm/plat-rk/include/plat/fiq.h
@@ -0,0 +1,10 @@
+#ifndef __PLAT_FIQ_H
+#define __PLAT_FIQ_H
+
+/* enable/disable an interrupt that is an FIQ (safe from FIQ context?) */
+void rk_fiq_enable(int n);
+void rk_fiq_disable(int n);
+void rk_irq_setpending(int irq);
+void rk_irq_clearpending(int irq);
+
+#endif

diff --git a/arch/arm/plat-rk/rk_fiq_debugger.c b/arch/arm/plat-rk/rk_fiq_debugger.c
index a3de3bd812c052ba423fddbe39999e99d2998368..7461f06676a9cd62032a5ca7d1917f865c213c1b 100644 (file)
--- a/arch/arm/plat-rk/rk_fiq_debugger.c
+++ b/arch/arm/plat-rk/rk_fiq_debugger.c
@@ -26,13 +26,11 @@
 #include <linux/serial_reg.h>
 #include <linux/slab.h>
 #include <linux/stacktrace.h>
+#include <linux/uaccess.h>
 #include <asm/fiq_debugger.h>
 #include <asm/hardware/gic.h>
 #include <plat/rk_fiq_debugger.h>
-#include <mach/system.h>
-#include <mach/fiq.h>
-
-#include <linux/uaccess.h>
+#include <plat/fiq.h>
 
 struct rk_fiq_debugger {
        struct fiq_debugger_pdata pdata;