system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'move-atmel-mci-h' into boards

Browse source
This commit is contained in:
Haavard Skinnemoen 2009-01-05 16:36:07 +01:00
commit 0e49005090
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/avr32/boards/atngw100/setup.c
View file

@ -19,8 +19,8 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/atmel-mci.h>
#include <asm/atmel-mci.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/setup.h> #include <asm/setup.h>

2
arch/avr32/boards/atstk1000/atstk1002.c
View file

@ -16,12 +16,12 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/at73c213.h> #include <linux/spi/at73c213.h>
#include <linux/atmel-mci.h>
#include <video/atmel_lcdc.h> #include <video/atmel_lcdc.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h> #include <mach/at32ap700x.h>
#include <mach/board.h> #include <mach/board.h>

2
arch/avr32/boards/atstk1000/atstk1003.c
View file

@ -17,9 +17,9 @@
#include <linux/spi/at73c213.h> #include <linux/spi/at73c213.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/atmel-mci.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h> #include <mach/at32ap700x.h>
#include <mach/board.h> #include <mach/board.h>

2
arch/avr32/boards/atstk1000/atstk1004.c
View file

@ -17,11 +17,11 @@
#include <linux/spi/at73c213.h> #include <linux/spi/at73c213.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/atmel-mci.h>
#include <video/atmel_lcdc.h> #include <video/atmel_lcdc.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/atmel-mci.h>
#include <mach/at32ap700x.h> #include <mach/at32ap700x.h>
#include <mach/board.h> #include <mach/board.h>

2
arch/avr32/boards/mimc200/setup.c
View file

@ -24,7 +24,7 @@ extern struct atmel_lcdfb_info mimc200_lcdc_data;
#include <video/atmel_lcdc.h> #include <video/atmel_lcdc.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <asm/atmel-mci.h> #include <linux/atmel-mci.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/setup.h> #include <asm/setup.h>

2
arch/avr32/mach-at32ap/at32ap700x.c
View file

@ -15,8 +15,8 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/usb/atmel_usba_udc.h> #include <linux/usb/atmel_usba_udc.h>
#include <linux/atmel-mci.h>
#include <asm/atmel-mci.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>

2
drivers/mmc/host/atmel-mci.c
View file

@ -25,8 +25,8 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/atmel-mci.h>
#include <asm/atmel-mci.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>

6
arch/avr32/include/asm/atmel-mci.h → include/linux/atmel-mci.h
View file

@ -1,5 +1,5 @@
#ifndef __ASM_AVR32_ATMEL_MCI_H #ifndef __LINUX_ATMEL_MCI_H
#define __ASM_AVR32_ATMEL_MCI_H #define __LINUX_ATMEL_MCI_H
#define ATMEL_MCI_MAX_NR_SLOTS 2 #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]; struct mci_slot_pdata slot[ATMEL_MCI_MAX_NR_SLOTS];
}; };
#endif /* __ASM_AVR32_ATMEL_MCI_H */ #endif /* __LINUX_ATMEL_MCI_H */