linux-stable-rt/drivers/ide
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
..
Kconfig Kconfig: remove redundant CONFIG_ prefix on two symbols 2011-10-13 18:14:28 +02:00
Makefile
aec62xx.c
ali14xx.c
alim15x3.c
amd74xx.c
at91_ide.c ARM: gpio: at91: convert drivers to use asm/gpio.h rather than mach/gpio.h 2011-08-08 14:27:48 +01:00
atiixp.c
au1xxx-ide.c
buddha.c
cmd64x.c
cmd640.c
cs5520.c
cs5530.c
cs5535.c
cs5536.c
cy82c693.c drivers/ide/cy82c693.c: Add missing pci_dev_put 2011-08-04 01:30:34 -07:00
delkin_cb.c
dtc2278.c
falconide.c
gayle.c
hpt366.c
ht6560b.c
icside.c
ide-4drives.c
ide-acpi.c
ide-atapi.c
ide-cd.c ide-cd: signedness warning fix again 2011-06-11 15:06:48 -07:00
ide-cd.h
ide-cd_ioctl.c
ide-cd_verbose.c
ide-cs.c
ide-devsets.c
ide-disk.c ide-disk: Fix request requeuing 2011-10-03 14:28:18 -04:00
ide-disk.h
ide-disk_ioctl.c
ide-disk_proc.c
ide-dma-sff.c
ide-dma.c
ide-eh.c
ide-floppy.c
ide-floppy.h
ide-floppy_ioctl.c
ide-floppy_proc.c
ide-gd.c
ide-gd.h
ide-generic.c
ide-h8300.c
ide-io-std.c
ide-io.c
ide-ioctls.c
ide-iops.c
ide-legacy.c
ide-lib.c
ide-park.c
ide-pci-generic.c
ide-pio-blacklist.c
ide-pm.c
ide-pnp.c
ide-probe.c
ide-proc.c
ide-scan-pci.c
ide-sysfs.c
ide-tape.c
ide-taskfile.c
ide-timings.c
ide-xfer-mode.c
ide.c
ide_platform.c ide: Fix irq flags madness 2011-08-04 01:29:51 -07:00
it821x.c
it8172.c
it8213.c
jmicron.c
macide.c
ns87415.c
opti621.c
palm_bk3710.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pdc202xx_new.c
pdc202xx_old.c
piix.c
pmac.c
q40ide.c
qd65xx.c
qd65xx.h
rapide.c
rz1000.c
sc1200.c
scc_pata.c
serverworks.c
setup-pci.c
sgiioc4.c
siimage.c
sis5513.c
sl82c105.c
slc90e66.c
tc86c001.c
triflex.c
trm290.c
tx4938ide.c
tx4939ide.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
umc8672.c
via82cxxx.c