A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'depends/rmk/gpio' into next/fixes

Browse source 
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <[email protected]>
This commit is contained in:
Arnd Bergmann 2011-10-31 22:44:18 +01:00
commit 43872fa788
256 changed files with 1660 additions and 1734 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/atmel_lcdfb.c
View file

@ -21,7 +21,7 @@
#include <mach/board.h>
#include <mach/cpu.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include <video/atmel_lcdc.h>

2
drivers/video/omap/lcd_apollon.c
View file

@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include "omapfb.h"

2
drivers/video/omap/lcd_h3.c
View file

@ -23,7 +23,7 @@
#include <linux/platform_device.h>
#include <linux/i2c/tps65010.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include "omapfb.h"
#define MODULE_NAME "omapfb-lcd_h3"

2
drivers/video/omap/lcd_inn1610.c
View file

@ -22,7 +22,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include "omapfb.h"
#define MODULE_NAME "omapfb-lcd_h3"

2
drivers/video/omap/lcd_ldp.c
View file

@ -26,7 +26,7 @@
#include <linux/delay.h>
#include <linux/i2c/twl.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include <plat/mux.h>
#include <asm/mach-types.h>

2
drivers/video/omap/lcd_osk.c
View file

@ -23,7 +23,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include <plat/mux.h>
#include "omapfb.h"

2
drivers/video/omap/lcd_overo.c
View file

@ -23,7 +23,7 @@
#include <linux/platform_device.h>
#include <linux/i2c/twl.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include <plat/mux.h>
#include <asm/mach-types.h>

2
drivers/video/omap/lcd_palmtt.c
View file

@ -29,7 +29,7 @@ GPIO13 - screen blanking
#include <linux/module.h>
#include <linux/io.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include "omapfb.h"
static int palmtt_panel_init(struct lcd_panel *panel,

2
drivers/video/pnx4008/sdum.c
View file

@ -30,7 +30,7 @@
#include <linux/clk.h>
#include <linux/gfp.h>
#include <asm/uaccess.h>
#include <mach/gpio.h>
#include <asm/gpio.h>
#include "sdum.h"
#include "fbcommon.h"