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 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

Browse source 
* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
This commit is contained in:
Linus Torvalds 2011-10-27 08:39:10 +02:00
commit ca90666287
257 changed files with 1755 additions and 1830 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"