kevin/linux
1
Fork 0
Code
ca90666287
linux/arch/arm/mach-w90x900
History
Linus Torvalds ca90666287 Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 
* '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
2011-10-27 08:39:10 +02:00
..
include/mach ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
clksel.c ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform 2009-09-02 11:22:23 +01:00
clock.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
clock.h ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
cpu.c treewide: remove extra semicolons from various parts of the kernel 2011-09-15 14:50:49 +02:00
cpu.h NUC900 LCD Controller Driver 2010-03-12 15:52:34 -08:00
dev.c ARM: 6250/1: patch for modifying spi flash configuration 2010-07-22 09:20:18 +01:00
gpio.c ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform 2009-09-02 11:22:23 +01:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
mach-nuc910evb.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-nuc950evb.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-nuc960evb.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
Makefile ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp.c ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 2010-05-24 22:25:34 +01:00
nuc910.c ARM: 6249/1: add nuc900 kpi platform_device structure to nuc910_dev 2010-07-22 09:20:17 +01:00
nuc910.h ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform 2009-09-02 11:22:23 +01:00
nuc950.c ARM: 6231/1: re-organize the nuc900 lcd arch platform data setting 2010-07-22 09:20:16 +01:00
nuc950.h ARM: 5683/1: Add nuc950 platform to w90x900 2009-09-02 11:22:24 +01:00
nuc960.c ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
nuc960.h ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
time.c clocksource: convert W90x900 24-bit down counting clocksource 2011-05-23 18:04:52 +01:00