aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/avr32/boards/atngw100/setup.c2
-rw-r--r--arch/avr32/boards/atstk1000/atstk1002.c2
-rw-r--r--arch/avr32/boards/atstk1000/atstk1003.c2
-rw-r--r--arch/avr32/boards/atstk1000/atstk1004.c2
-rw-r--r--arch/avr32/boards/mimc200/setup.c2
-rw-r--r--arch/avr32/mach-at32ap/at32ap700x.c2
-rw-r--r--drivers/mmc/host/atmel-mci.c2
-rw-r--r--include/linux/atmel-mci.h (renamed from arch/avr32/include/asm/atmel-mci.h)6
8 files changed, 10 insertions, 10 deletions
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 32fb9ba0fbdf..05d3722fff18 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -19,8 +19,8 @@
19#include <linux/types.h> 19#include <linux/types.h>
20#include <linux/leds.h> 20#include <linux/leds.h>
21#include <linux/spi/spi.h> 21#include <linux/spi/spi.h>
22#include <linux/atmel-mci.h>
22 23
23#include <asm/atmel-mci.h>
24#include <asm/io.h> 24#include <asm/io.h>
25#include <asm/setup.h> 25#include <asm/setup.h>
26 26
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 5c5cdf3b464f..6d94f74bc5c7 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -16,12 +16,12 @@
16#include <linux/types.h> 16#include <linux/types.h>
17#include <linux/spi/spi.h> 17#include <linux/spi/spi.h>
18#include <linux/spi/at73c213.h> 18#include <linux/spi/at73c213.h>
19#include <linux/atmel-mci.h>
19 20
20#include <video/atmel_lcdc.h> 21#include <video/atmel_lcdc.h>
21 22
22#include <asm/io.h> 23#include <asm/io.h>
23#include <asm/setup.h> 24#include <asm/setup.h>
24#include <asm/atmel-mci.h>
25 25
26#include <mach/at32ap700x.h> 26#include <mach/at32ap700x.h>
27#include <mach/board.h> 27#include <mach/board.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index 134b566630b0..db2038cd2e5b 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -17,9 +17,9 @@
17 17
18#include <linux/spi/at73c213.h> 18#include <linux/spi/at73c213.h>
19#include <linux/spi/spi.h> 19#include <linux/spi/spi.h>
20#include <linux/atmel-mci.h>
20 21
21#include <asm/setup.h> 22#include <asm/setup.h>
22#include <asm/atmel-mci.h>
23 23
24#include <mach/at32ap700x.h> 24#include <mach/at32ap700x.h>
25#include <mach/board.h> 25#include <mach/board.h>
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index cb32eb844aa7..29b35aca96cd 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -17,11 +17,11 @@
17 17
18#include <linux/spi/at73c213.h> 18#include <linux/spi/at73c213.h>
19#include <linux/spi/spi.h> 19#include <linux/spi/spi.h>
20#include <linux/atmel-mci.h>
20 21
21#include <video/atmel_lcdc.h> 22#include <video/atmel_lcdc.h>
22 23
23#include <asm/setup.h> 24#include <asm/setup.h>
24#include <asm/atmel-mci.h>
25 25
26#include <mach/at32ap700x.h> 26#include <mach/at32ap700x.h>
27#include <mach/board.h> 27#include <mach/board.h>
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index 397cbb8f44c8..811d73027f77 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -24,7 +24,7 @@ extern struct atmel_lcdfb_info mimc200_lcdc_data;
24#include <video/atmel_lcdc.h> 24#include <video/atmel_lcdc.h>
25#include <linux/fb.h> 25#include <linux/fb.h>
26 26
27#include <asm/atmel-mci.h> 27#include <linux/atmel-mci.h>
28#include <linux/io.h> 28#include <linux/io.h>
29#include <asm/setup.h> 29#include <asm/setup.h>
30 30
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 066252eebf61..3cf49553e4f9 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -15,8 +15,8 @@
15#include <linux/gpio.h> 15#include <linux/gpio.h>
16#include <linux/spi/spi.h> 16#include <linux/spi/spi.h>
17#include <linux/usb/atmel_usba_udc.h> 17#include <linux/usb/atmel_usba_udc.h>
18#include <linux/atmel-mci.h>
18 19
19#include <asm/atmel-mci.h>
20#include <asm/io.h> 20#include <asm/io.h>
21#include <asm/irq.h> 21#include <asm/irq.h>
22 22
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 7a3f2436b011..1e97916914ad 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -25,8 +25,8 @@
25#include <linux/stat.h> 25#include <linux/stat.h>
26 26
27#include <linux/mmc/host.h> 27#include <linux/mmc/host.h>
28#include <linux/atmel-mci.h>
28 29
29#include <asm/atmel-mci.h>
30#include <asm/io.h> 30#include <asm/io.h>
31#include <asm/unaligned.h> 31#include <asm/unaligned.h>
32 32
diff --git a/arch/avr32/include/asm/atmel-mci.h b/include/linux/atmel-mci.h
index 59f3fadd0b68..2a2213eefd85 100644
--- a/arch/avr32/include/asm/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -1,5 +1,5 @@
1#ifndef __ASM_AVR32_ATMEL_MCI_H 1#ifndef __LINUX_ATMEL_MCI_H
2#define __ASM_AVR32_ATMEL_MCI_H 2#define __LINUX_ATMEL_MCI_H
3 3
4#define ATMEL_MCI_MAX_NR_SLOTS 2 4#define ATMEL_MCI_MAX_NR_SLOTS 2
5 5
@@ -36,4 +36,4 @@ struct mci_platform_data {
36 struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS]; 36 struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS];
37}; 37};
38 38
39#endif /* __ASM_AVR32_ATMEL_MCI_H */ 39#endif /* __LINUX_ATMEL_MCI_H */