From ca1b0a8598a3606a3b4e99738ba732d958d2305e Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 7 Nov 2011 18:02:39 +0000
Subject: [PATCH] --- yaml --- r: 279816 b: refs/heads/master c:
 e5bc9e257a4ef3dabc6b5573215983d663ffcd55 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/arm/mach-w90x900/irq.c    |  2 ++
 trunk/arch/arm/mach-w90x900/nuc910.h |  9 +--------
 trunk/arch/arm/mach-w90x900/nuc950.h |  9 +--------
 trunk/arch/arm/mach-w90x900/nuc960.h |  9 +--------
 trunk/arch/arm/mach-w90x900/nuc9xx.h | 23 +++++++++++++++++++++++
 trunk/arch/arm/mach-w90x900/time.c   |  2 ++
 7 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 trunk/arch/arm/mach-w90x900/nuc9xx.h

diff --git a/[refs] b/[refs]
index b086ad8077c0..0aaf007d9bc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a083227a45cbbf5d29e6fe7c093af9e09905d4d
+refs/heads/master: e5bc9e257a4ef3dabc6b5573215983d663ffcd55
diff --git a/trunk/arch/arm/mach-w90x900/irq.c b/trunk/arch/arm/mach-w90x900/irq.c
index 7bf143c443f1..b466e2450ba3 100644
--- a/trunk/arch/arm/mach-w90x900/irq.c
+++ b/trunk/arch/arm/mach-w90x900/irq.c
@@ -28,6 +28,8 @@
 #include <mach/hardware.h>
 #include <mach/regs-irq.h>
 
+#include "nuc9xx.h"
+
 struct group_irq {
 	unsigned long		gpen;
 	unsigned int		enabled;
diff --git a/trunk/arch/arm/mach-w90x900/nuc910.h b/trunk/arch/arm/mach-w90x900/nuc910.h
index 83e9ba5fc26c..b14c71a9e683 100644
--- a/trunk/arch/arm/mach-w90x900/nuc910.h
+++ b/trunk/arch/arm/mach-w90x900/nuc910.h
@@ -12,14 +12,7 @@
  * published by the Free Software Foundation.
  *
  */
-
-struct map_desc;
-struct sys_timer;
-
-/* core initialisation functions */
-
-extern void nuc900_init_irq(void);
-extern struct sys_timer nuc900_timer;
+#include "nuc9xx.h"
 
 /* extern file from nuc910.c */
 
diff --git a/trunk/arch/arm/mach-w90x900/nuc950.h b/trunk/arch/arm/mach-w90x900/nuc950.h
index 98a1148bc5ae..6e9de3051cd4 100644
--- a/trunk/arch/arm/mach-w90x900/nuc950.h
+++ b/trunk/arch/arm/mach-w90x900/nuc950.h
@@ -12,14 +12,7 @@
  * published by the Free Software Foundation.
  *
  */
-
-struct map_desc;
-struct sys_timer;
-
-/* core initialisation functions */
-
-extern void nuc900_init_irq(void);
-extern struct sys_timer nuc900_timer;
+#include "nuc9xx.h"
 
 /* extern file from nuc950.c */
 
diff --git a/trunk/arch/arm/mach-w90x900/nuc960.h b/trunk/arch/arm/mach-w90x900/nuc960.h
index f0c07cbe3a82..9f6df9a00286 100644
--- a/trunk/arch/arm/mach-w90x900/nuc960.h
+++ b/trunk/arch/arm/mach-w90x900/nuc960.h
@@ -12,14 +12,7 @@
  * published by the Free Software Foundation.
  *
  */
-
-struct map_desc;
-struct sys_timer;
-
-/* core initialisation functions */
-
-extern void nuc900_init_irq(void);
-extern struct sys_timer nuc900_timer;
+#include "nuc9xx.h"
 
 /* extern file from nuc960.c */
 
diff --git a/trunk/arch/arm/mach-w90x900/nuc9xx.h b/trunk/arch/arm/mach-w90x900/nuc9xx.h
new file mode 100644
index 000000000000..847c4f3e0440
--- /dev/null
+++ b/trunk/arch/arm/mach-w90x900/nuc9xx.h
@@ -0,0 +1,23 @@
+/*
+ * arch/arm/mach-w90x900/nuc9xx.h
+ *
+ * Copied from nuc910.h, which had:
+ *
+ * Copyright (c) 2008 Nuvoton corporation
+ *
+ * Header file for NUC900 CPU support
+ *
+ * Wan ZongShun <mcuos.com@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+struct map_desc;
+struct sys_timer;
+
+/* core initialisation functions */
+
+extern void nuc900_init_irq(void);
+extern struct sys_timer nuc900_timer;
diff --git a/trunk/arch/arm/mach-w90x900/time.c b/trunk/arch/arm/mach-w90x900/time.c
index a2c4e2d0a0d4..fa27c498ac09 100644
--- a/trunk/arch/arm/mach-w90x900/time.c
+++ b/trunk/arch/arm/mach-w90x900/time.c
@@ -33,6 +33,8 @@
 #include <mach/map.h>
 #include <mach/regs-timer.h>
 
+#include "nuc9xx.h"
+
 #define RESETINT	0x1f
 #define PERIOD		(0x01 << 27)
 #define ONESHOT		(0x00 << 27)