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

Commit ae1cde8c authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'nomadik' into devel

parents e59d969f 9b472600

arch/arm/mach-nomadik/board-nhk8815.c

+1 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/pinctrl/machine.h>

#include <linux/platform_data/pinctrl-nomadik.h>

#include <asm/hardware/vic.h>

#include <asm/sizes.h>

#include <asm/mach-types.h>
@@ -32,9 +33,7 @@ 
#include <asm/mach/flash.h>

#include <asm/mach/time.h>



#include <plat/gpio-nomadik.h>

#include <plat/mtu.h>

#include <plat/pincfg.h>



#include <linux/platform_data/mtd-nomadik-nand.h>

#include <mach/fsmc.h>

arch/arm/mach-nomadik/cpu-8815.c

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
#include <linux/irq.h>

#include <linux/dma-mapping.h>

#include <linux/platform_data/clk-nomadik.h>

#include <linux/platform_data/pinctrl-nomadik.h>



#include <plat/gpio-nomadik.h>

#include <mach/hardware.h>

#include <mach/irqs.h>

#include <asm/mach/map.h>

arch/arm/mach-nomadik/i2c-8815nhk.c

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#include <linux/i2c-algo-bit.h>

#include <linux/i2c-gpio.h>

#include <linux/platform_device.h>

#include <plat/gpio-nomadik.h>

#include <plat/pincfg.h>

#include <linux/platform_data/pinctrl-nomadik.h>



/*

 * There are two busses in the 8815NHK.

arch/arm/mach-ux500/board-mop500-audio.c

+1 −2
Original line number Diff line number Diff line
@@ -7,9 +7,8 @@ 
#include <linux/platform_device.h>

#include <linux/init.h>

#include <linux/gpio.h>

#include <linux/platform_data/pinctrl-nomadik.h>



#include <plat/gpio-nomadik.h>

#include <plat/pincfg.h>

#include <plat/ste_dma40.h>



#include <mach/devices.h>

arch/arm/mach-ux500/board-mop500-pins.c

+1 −2
Original line number Diff line number Diff line
@@ -9,10 +9,9 @@ 
#include <linux/bug.h>

#include <linux/string.h>

#include <linux/pinctrl/machine.h>

#include <linux/platform_data/pinctrl-nomadik.h>



#include <asm/mach-types.h>

#include <plat/pincfg.h>

#include <plat/gpio-nomadik.h>



#include <mach/hardware.h>