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 /drivers | |
| parent | a5c474580b8b7cc8b7b2cca9a2bd27ff5c065e70 (diff) | |
| download | kernel_goldelico_gta04-55d8baee4a0b4709061104f7a56f53a310de76ac.zip kernel_goldelico_gta04-55d8baee4a0b4709061104f7a56f53a310de76ac.tar.gz kernel_goldelico_gta04-55d8baee4a0b4709061104f7a56f53a310de76ac.tar.bz2 | |
[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 'drivers')
| -rw-r--r-- | drivers/char/watchdog/at91rm9200_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/at91_mci.c | 4 | ||||
| -rw-r--r-- | drivers/pcmcia/at91_cf.c | 2 | ||||
| -rw-r--r-- | drivers/serial/atmel_serial.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/char/watchdog/at91rm9200_wdt.c index 4e7a114..cb86967 100644 --- a/drivers/char/watchdog/at91rm9200_wdt.c +++ b/drivers/char/watchdog/at91rm9200_wdt.c @@ -21,6 +21,7 @@ #include <linux/watchdog.h> #include <asm/bitops.h> #include <asm/uaccess.h> +#include <asm/arch/at91_st.h> #define WDT_DEFAULT_TIME 5 /* seconds */ diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c index 494b23f..41761f7 100644 --- a/drivers/mmc/at91_mci.c +++ b/drivers/mmc/at91_mci.c @@ -73,8 +73,8 @@ #include <asm/mach/mmc.h> #include <asm/arch/board.h> #include <asm/arch/gpio.h> -#include <asm/arch/at91rm9200_mci.h> -#include <asm/arch/at91rm9200_pdc.h> +#include <asm/arch/at91_mci.h> +#include <asm/arch/at91_pdc.h> #define DRIVER_NAME "at91_mci" diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 3bcb7dc..6979667 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -23,9 +23,9 @@ #include <asm/io.h> #include <asm/sizes.h> -#include <asm/arch/at91rm9200.h> #include <asm/arch/board.h> #include <asm/arch/gpio.h> +#include <asm/arch/at91rm9200_mc.h> /* diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 877876e..f930df0 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -36,9 +36,9 @@ #include <asm/io.h> -#include <asm/arch/at91rm9200_pdc.h> #include <asm/mach/serial_at91.h> #include <asm/arch/board.h> +#include <asm/arch/at91_pdc.h> #ifdef CONFIG_ARM #include <asm/arch/system.h> #include <asm/arch/gpio.h> |