]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
atmel-mci: move atmel-mci.h file to include/linux
authorNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 20 Nov 2008 14:59:12 +0000 (15:59 +0100)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Mon, 5 Jan 2009 15:35:31 +0000 (16:35 +0100)
Needed to use the atmel-mci driver in an architecture
independant maner.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
arch/avr32/boards/atngw100/setup.c
arch/avr32/boards/atstk1000/atstk1002.c
arch/avr32/boards/atstk1000/atstk1003.c
arch/avr32/boards/atstk1000/atstk1004.c
arch/avr32/boards/mimc200/setup.c
arch/avr32/mach-at32ap/at32ap700x.c
drivers/mmc/host/atmel-mci.c
include/linux/atmel-mci.h [moved from arch/avr32/include/asm/atmel-mci.h with 91% similarity]

index 32fb9ba0fbdfe40e6943b2c5bdebbfd706bd59ad..05d3722fff18e75474559bdbb4f0e8f7fb4785c0 100644 (file)
@@ -19,8 +19,8 @@
 #include <linux/types.h>
 #include <linux/leds.h>
 #include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
 
-#include <asm/atmel-mci.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 
index 5c5cdf3b464fb8d99394e408ed49b700babc1ec4..6d94f74bc5c7e3d8b9cc5e5d8ff738ade85ba945 100644 (file)
 #include <linux/types.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/at73c213.h>
+#include <linux/atmel-mci.h>
 
 #include <video/atmel_lcdc.h>
 
 #include <asm/io.h>
 #include <asm/setup.h>
-#include <asm/atmel-mci.h>
 
 #include <mach/at32ap700x.h>
 #include <mach/board.h>
index 134b566630b0f62a75aad5832278c4dcf7aeac91..db2038cd2e5ba3208b3c06cc94102b6d2bda5c4b 100644 (file)
@@ -17,9 +17,9 @@
 
 #include <linux/spi/at73c213.h>
 #include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
 
 #include <asm/setup.h>
-#include <asm/atmel-mci.h>
 
 #include <mach/at32ap700x.h>
 #include <mach/board.h>
index cb32eb844aa743ca69d7ff181353ad669330832d..29b35aca96cdeedb0ca5bb467c58d7576020e96c 100644 (file)
 
 #include <linux/spi/at73c213.h>
 #include <linux/spi/spi.h>
+#include <linux/atmel-mci.h>
 
 #include <video/atmel_lcdc.h>
 
 #include <asm/setup.h>
-#include <asm/atmel-mci.h>
 
 #include <mach/at32ap700x.h>
 #include <mach/board.h>
index 397cbb8f44c892071cd8470dffc3231b9a82ae48..811d73027f7706c49ffe36eebbbdba20051ac9d5 100644 (file)
@@ -24,7 +24,7 @@ extern struct atmel_lcdfb_info mimc200_lcdc_data;
 #include <video/atmel_lcdc.h>
 #include <linux/fb.h>
 
-#include <asm/atmel-mci.h>
+#include <linux/atmel-mci.h>
 #include <linux/io.h>
 #include <asm/setup.h>
 
index 066252eebf614e98ffb96c1c58705cbb9e35840b..3cf49553e4f9a154b57e5d7e56040922da6bd5fa 100644 (file)
@@ -15,8 +15,8 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/atmel_usba_udc.h>
+#include <linux/atmel-mci.h>
 
-#include <asm/atmel-mci.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
index 7a3f2436b0119f5a6ae49c65bf39bef0bc1fb286..1e97916914adf9b596f7dc17795979cf47b3ceff 100644 (file)
@@ -25,8 +25,8 @@
 #include <linux/stat.h>
 
 #include <linux/mmc/host.h>
+#include <linux/atmel-mci.h>
 
-#include <asm/atmel-mci.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 
similarity index 91%
rename from arch/avr32/include/asm/atmel-mci.h
rename to include/linux/atmel-mci.h
index 59f3fadd0b68a45e07353fb8d6e3d97d5e7aba90..2a2213eefd859ed1e6e15354c522d18ac5ae83da 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef __ASM_AVR32_ATMEL_MCI_H
-#define __ASM_AVR32_ATMEL_MCI_H
+#ifndef __LINUX_ATMEL_MCI_H
+#define __LINUX_ATMEL_MCI_H
 
 #define ATMEL_MCI_MAX_NR_SLOTS 2
 
@@ -36,4 +36,4 @@ struct mci_platform_data {
        struct mci_slot_pdata   slot[ATMEL_MCI_MAX_NR_SLOTS];
 };
 
-#endif /* __ASM_AVR32_ATMEL_MCI_H */
+#endif /* __LINUX_ATMEL_MCI_H */