From e73e5761a73eccee96bd8e43b6c348ce501d950e Mon Sep 17 00:00:00 2001
From: Andrew Victor <andrew@sanpeople.com>
Date: Tue, 20 Jun 2006 19:31:39 +0100
Subject: [PATCH] --- yaml --- r: 28103 b: refs/heads/master c:
 55c20c0af7fe7d5d09af4addfafcfe3bdc500f5d h: refs/heads/master i:   28101:
 1764a0624792f7a3b0a0c769144f8d03970a7a4b   28099:
 1fdfb27b98bd0a1dc0146943065105508aae1a94   28095:
 5a2e1dbbe80ed2221c363c3202789e0e551deb06 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-at91rm9200/clock.c        |  5 +----
 trunk/arch/arm/mach-at91rm9200/common.c       | 11 -----------
 trunk/include/asm-arm/arch-at91rm9200/board.h |  7 -------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 2908c9158617..d856e19a51f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c3fddced9f62f4b175ce400bb96b23f47626e50
+refs/heads/master: 55c20c0af7fe7d5d09af4addfafcfe3bdc500f5d
diff --git a/trunk/arch/arm/mach-at91rm9200/clock.c b/trunk/arch/arm/mach-at91rm9200/clock.c
index 30042d2bac5f..fe71b834899b 100644
--- a/trunk/arch/arm/mach-at91rm9200/clock.c
+++ b/trunk/arch/arm/mach-at91rm9200/clock.c
@@ -28,10 +28,10 @@
 #include <asm/mach-types.h>
 
 #include <asm/arch/hardware.h>
-#include <asm/arch/board.h>		/* for master clock global */
 
 #include "generic.h"
 
+
 /*
  * There's a lot more which can be done with clocks, including cpufreq
  * integration, slow clock mode support (for system suspend), letting
@@ -722,9 +722,6 @@ int __init at91_clock_init(unsigned long main_clock)
 		(unsigned) main_clock / 1000000,
 		((unsigned) main_clock % 1000000) / 1000);
 
-	/* FIXME get rid of master_clock global */
-	at91_master_clock = mck.rate_hz;
-
 #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
 	/* establish PCK0..PCK3 parentage */
 	for (tmp = 0; tmp < ARRAY_SIZE(clock_list); tmp++) {
diff --git a/trunk/arch/arm/mach-at91rm9200/common.c b/trunk/arch/arm/mach-at91rm9200/common.c
index 40d29a73b5c5..1da68966e77f 100644
--- a/trunk/arch/arm/mach-at91rm9200/common.c
+++ b/trunk/arch/arm/mach-at91rm9200/common.c
@@ -108,14 +108,3 @@ void __init at91rm9200_map_io(void)
 	iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
 }
 
-
-unsigned long at91_master_clock;
-
-EXPORT_SYMBOL(at91_master_clock);
-
-
-int at91_serial_map[AT91_NR_UART];
-int at91_console_port;
-
-EXPORT_SYMBOL(at91_serial_map);
-EXPORT_SYMBOL(at91_console_port);
diff --git a/trunk/include/asm-arm/arch-at91rm9200/board.h b/trunk/include/asm-arm/arch-at91rm9200/board.h
index 587948d56753..1fdd70b23809 100644
--- a/trunk/include/asm-arm/arch-at91rm9200/board.h
+++ b/trunk/include/asm-arm/arch-at91rm9200/board.h
@@ -31,13 +31,6 @@
 #ifndef __ASM_ARCH_BOARD_H
 #define __ASM_ARCH_BOARD_H
 
- /* Clocks */
-extern unsigned long at91_master_clock;
-
- /* Serial Port */
-extern int at91_serial_map[AT91_NR_UART];
-extern int at91_console_port;
-
 #include <linux/mtd/partitions.h>
 #include <linux/device.h>
 #include <linux/spi/spi.h>