Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e490050 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

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

parents dd5e1339 c42aa775

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/avr32/boards/atstk1000/atstk1002.c

+1 −1
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
#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>

arch/avr32/boards/atstk1000/atstk1003.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/avr32/boards/atstk1000/atstk1004.c

+1 −1
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 


#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>

arch/avr32/boards/mimc200/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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>