From 5d73bc7af75b004d4eb343572e3ff5bc5727a048 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20Bie=C3=9Fmann?= Date: Thu, 4 Nov 2010 23:15:30 +0000 Subject: [PATCH] avr32: rename memory-map.h -> hardware.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Bießmann --- arch/avr32/cpu/at32ap700x/clk.c | 2 +- arch/avr32/cpu/at32ap700x/portmux.c | 2 +- arch/avr32/cpu/cpu.c | 2 +- arch/avr32/cpu/hsdramc.c | 2 +- arch/avr32/cpu/interrupts.c | 2 +- arch/avr32/cpu/portmux-gpio.c | 2 +- arch/avr32/cpu/portmux-pio.c | 2 +- arch/avr32/include/asm/arch-at32ap700x/gpio.h | 2 +- .../include/asm/arch-at32ap700x/{memory-map.h => hardware.h} | 0 board/miromico/hammerhead/hammerhead.c | 2 +- drivers/mmc/atmel_mci.c | 2 +- include/configs/atngw100.h | 2 +- include/configs/atstk1002.h | 2 +- include/configs/atstk1003.h | 2 +- include/configs/atstk1004.h | 2 +- include/configs/atstk1006.h | 2 +- include/configs/favr-32-ezkit.h | 2 +- include/configs/mimc200.h | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename arch/avr32/include/asm/arch-at32ap700x/{memory-map.h => hardware.h} (100%) diff --git a/arch/avr32/cpu/at32ap700x/clk.c b/arch/avr32/cpu/at32ap700x/clk.c index 742bc6b5a2..b63b9df143 100644 --- a/arch/avr32/cpu/at32ap700x/clk.c +++ b/arch/avr32/cpu/at32ap700x/clk.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "sm.h" diff --git a/arch/avr32/cpu/at32ap700x/portmux.c b/arch/avr32/cpu/at32ap700x/portmux.c index b1f2c6f1ff..e3e38a2a75 100644 --- a/arch/avr32/cpu/at32ap700x/portmux.c +++ b/arch/avr32/cpu/at32ap700x/portmux.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include /* diff --git a/arch/avr32/cpu/cpu.c b/arch/avr32/cpu/cpu.c index e4489bb2e2..790783767f 100644 --- a/arch/avr32/cpu/cpu.c +++ b/arch/avr32/cpu/cpu.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "hsmc3.h" diff --git a/arch/avr32/cpu/hsdramc.c b/arch/avr32/cpu/hsdramc.c index b6eae667c2..1485494f49 100644 --- a/arch/avr32/cpu/hsdramc.c +++ b/arch/avr32/cpu/hsdramc.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "hsdramc1.h" diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c index c6d8d16e39..c751981b34 100644 --- a/arch/avr32/cpu/interrupts.c +++ b/arch/avr32/cpu/interrupts.c @@ -27,7 +27,7 @@ #include #include -#include +#include #define HANDLER_MASK 0x00ffffff #define INTLEV_SHIFT 30 diff --git a/arch/avr32/cpu/portmux-gpio.c b/arch/avr32/cpu/portmux-gpio.c index 9acd040d1b..7b64c89a98 100644 --- a/arch/avr32/cpu/portmux-gpio.c +++ b/arch/avr32/cpu/portmux-gpio.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include void portmux_select_peripheral(void *port, unsigned long pin_mask, diff --git a/arch/avr32/cpu/portmux-pio.c b/arch/avr32/cpu/portmux-pio.c index a29f94e3ba..cb5e96205a 100644 --- a/arch/avr32/cpu/portmux-pio.c +++ b/arch/avr32/cpu/portmux-pio.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include void portmux_select_peripheral(void *port, unsigned long pin_mask, diff --git a/arch/avr32/include/asm/arch-at32ap700x/gpio.h b/arch/avr32/include/asm/arch-at32ap700x/gpio.h index 303e35313a..b0254f2d7f 100644 --- a/arch/avr32/include/asm/arch-at32ap700x/gpio.h +++ b/arch/avr32/include/asm/arch-at32ap700x/gpio.h @@ -23,7 +23,7 @@ #define __ASM_AVR32_ARCH_GPIO_H__ #include -#include +#include #define NR_GPIO_CONTROLLERS 5 diff --git a/arch/avr32/include/asm/arch-at32ap700x/memory-map.h b/arch/avr32/include/asm/arch-at32ap700x/hardware.h similarity index 100% rename from arch/avr32/include/asm/arch-at32ap700x/memory-map.h rename to arch/avr32/include/asm/arch-at32ap700x/hardware.h diff --git a/board/miromico/hammerhead/hammerhead.c b/board/miromico/hammerhead/hammerhead.c index 78f4fd405e..a0794ba966 100644 --- a/board/miromico/hammerhead/hammerhead.c +++ b/board/miromico/hammerhead/hammerhead.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c index 3946ffeebe..0af8d42611 100644 --- a/drivers/mmc/atmel_mci.c +++ b/drivers/mmc/atmel_mci.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "atmel_mci.h" diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 92491ca09d..a3e92e8162 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -24,7 +24,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include #define CONFIG_AVR32 1 #define CONFIG_AT32AP 1 diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 6416d17091..252c5ae699 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -24,7 +24,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include #define CONFIG_AVR32 1 #define CONFIG_AT32AP 1 diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h index a4d9b0b908..8f060817fd 100644 --- a/include/configs/atstk1003.h +++ b/include/configs/atstk1003.h @@ -24,7 +24,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include #define CONFIG_AVR32 1 #define CONFIG_AT32AP 1 diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h index 06bb5da8a3..12c9414a67 100644 --- a/include/configs/atstk1004.h +++ b/include/configs/atstk1004.h @@ -24,7 +24,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include #define CONFIG_AVR32 1 #define CONFIG_AT32AP 1 diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h index d3cbee6b63..8cbaf75a64 100644 --- a/include/configs/atstk1006.h +++ b/include/configs/atstk1006.h @@ -24,7 +24,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include #define CONFIG_AVR32 1 #define CONFIG_AT32AP 1 diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index 1c381c76b8..a65fbd409f 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -22,7 +22,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include #define CONFIG_AVR32 1 #define CONFIG_AT32AP 1 diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h index 16e2ec62ee..a5c52e5cfe 100644 --- a/include/configs/mimc200.h +++ b/include/configs/mimc200.h @@ -24,7 +24,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#include +#include #define CONFIG_AVR32 1 #define CONFIG_AT32AP 1 -- 2.39.5