diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-11-30 17:16:43 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-30 22:51:40 +0000 |
commit | 55d8baee4a0b4709061104f7a56f53a310de76ac (patch) | |
tree | c59d7a736b30d7f2f088ed49bb3a9dacd54bdbc0 /arch/arm/mach-at91rm9200 | |
parent | a5c474580b8b7cc8b7b2cca9a2bd27ff5c065e70 (diff) | |
download | op-kernel-dev-55d8baee4a0b4709061104f7a56f53a310de76ac.zip op-kernel-dev-55d8baee4a0b4709061104f7a56f53a310de76ac.tar.gz |
[ARM] 3954/1: AT91: Update drivers for new headers
This patch updates the drivers (and other files) which include the
hardware headers. This fixes the breakage introduced in patches 3950/1
and 3951/1 (those patches were getting big).
The AVR32 architecture uses the same serial driver and had its own copy
of at91rm9200_pdc.h. Renamed it to at91_pdc.h
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91rm9200')
-rw-r--r-- | arch/arm/mach-at91rm9200/at91rm9200.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/at91rm9200_time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/clock.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/gpio.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/pm.c | 2 |
5 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-at91rm9200/at91rm9200.c b/arch/arm/mach-at91rm9200/at91rm9200.c index 0422593..0816a8d 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200.c +++ b/arch/arm/mach-at91rm9200/at91rm9200.c @@ -15,8 +15,9 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/arch/at91rm9200.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/at91_st.h> -#include <asm/hardware.h> #include "generic.h" #include "clock.h" diff --git a/arch/arm/mach-at91rm9200/at91rm9200_time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c index 07c9cea..8e9c049 100644 --- a/arch/arm/mach-at91rm9200/at91rm9200_time.c +++ b/arch/arm/mach-at91rm9200/at91rm9200_time.c @@ -30,6 +30,8 @@ #include <asm/io.h> #include <asm/mach/time.h> +#include <asm/arch/at91_st.h> + static unsigned long last_crtr; /* diff --git a/arch/arm/mach-at91rm9200/clock.c b/arch/arm/mach-at91rm9200/clock.c index a43b061..1e0000c 100644 --- a/arch/arm/mach-at91rm9200/clock.c +++ b/arch/arm/mach-at91rm9200/clock.c @@ -28,6 +28,7 @@ #include <asm/mach-types.h> #include <asm/hardware.h> +#include <asm/arch/at91_pmc.h> #include "clock.h" diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c index 7467d64..e76422761 100644 --- a/arch/arm/mach-at91rm9200/gpio.c +++ b/arch/arm/mach-at91rm9200/gpio.c @@ -19,6 +19,8 @@ #include <asm/io.h> #include <asm/hardware.h> +#include <asm/arch/at91_pio.h> +#include <asm/arch/at91_pmc.h> #include <asm/arch/gpio.h> #include "generic.h" diff --git a/arch/arm/mach-at91rm9200/pm.c b/arch/arm/mach-at91rm9200/pm.c index 5e3b6e3..5b775fa 100644 --- a/arch/arm/mach-at91rm9200/pm.c +++ b/arch/arm/mach-at91rm9200/pm.c @@ -26,6 +26,8 @@ #include <asm/mach/irq.h> #include <asm/mach-types.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/at91rm9200_mc.h> #include <asm/arch/gpio.h> #include "generic.h" |