Russell King 3f17522ce4 Video: ARM CLCD: Better fix for swapped IENB and CNTL registers ... On PL111, as found on Realview and other platforms, these registers are always arranged as CNTL then IENB. On PL110, these registers are IENB then CNTL, except on Versatile platforms. Re-arrange the handling of these register swaps so that PL111 always gets it right without resorting to ifdefs, leaving the only case needing special handling being PL110 on Versatile. Fill out amba/clcd.h with the PL110/PL111 register definition differences in case someone tries to use the PL110 specific definitions on PL111. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2010-03-14 19:42:44 +00:00
..
accessibility
acpi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
amba
ata	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
atm
auxdisplay	auxdisplay: move cfag12864bfb's probe function to .devinit.text	2010-03-07 17:04:50 -08:00
base	Driver core: create lock/unlock functions for struct device	2010-03-07 17:04:52 -08:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
bluetooth	Bluetooth: Convert Marvell driver to use per adapter debugfs	2010-02-27 14:05:38 +01:00
cdrom	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
clocksource	MFGPT: move clocksource menu	2010-03-06 11:26:28 -08:00
connector
cpufreq	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
cpuidle	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
crypto	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
dca
dio
dma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
edac	edac: e752x: add dram scrubbing support	2010-03-12 15:52:40 -08:00
eisa	eisa: fix coding style for eisa bus code	2010-03-06 11:26:32 -08:00
firewire	Driver core: create lock/unlock functions for struct device	2010-03-07 17:04:52 -08:00
firmware	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
gpio	driver-core: Add attribute argument to class_attribute show/store	2010-03-07 17:04:48 -08:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
hid	USB: Push BKL on open down into the drivers	2010-03-02 14:54:23 -08:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-03-06 11:33:09 -08:00
i2c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6	2010-03-04 08:24:06 -08:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
isdn	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
leds	led: Enable led in 88pm860x	2010-03-07 22:17:05 +01:00
lguest
macintosh	powerpc: Fix G5 thermal shutdown	2010-03-09 11:55:27 +11:00
mca
md	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
memstick	block: Consolidate phys_segment and hw_segment limits	2010-02-26 13:58:08 +01:00
message	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
mfd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6	2010-03-12 16:41:09 -08:00
misc	sgi-gru: use for_each_set_bit()	2010-03-12 15:52:44 -08:00
mmc	Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm	2010-03-12 16:21:24 -08:00
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
nubus
of
oprofile
parisc	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
parport	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
pci	dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h	2010-03-12 15:52:42 -08:00
pcmcia	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-03-12 16:00:54 -08:00
platform	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
pnp
power	power_supply: Enable power supply of max8925	2010-03-07 22:17:17 +01:00
pps	pps: serial clients support	2010-03-12 15:52:43 -08:00
ps3
rapidio
regulator	regulator: Add max8925 support	2010-03-07 22:17:08 +01:00
rtc	rtc/hctosys: only claim the RTC provided the system time if it did	2010-03-12 15:52:28 -08:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
serial	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
sfi
sh	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00
sn
spi	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
ssb
staging	driver core: Convert some drivers to CLASS_ATTR_STRING	2010-03-07 17:04:48 -08:00
tc
telephony
thermal
uio	UIO: Remove SMX Cryptengine driver	2010-03-07 17:04:51 -08:00
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
uwb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
vhost	vhost-net: restart tx poll on sk_sndbuf full	2010-02-28 19:50:33 +02:00
video	Video: ARM CLCD: Better fix for swapped IENB and CNTL registers	2010-03-14 19:42:44 +00:00
virtio	virtio: set pci bus master enable bit	2010-03-02 13:41:14 +02:00
vlynq
w1	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
watchdog	[WATCHDOG] i6300esb.c: change platform_driver to pci_driver	2010-03-08 13:48:01 +00:00
xen	Driver core: Constify struct sysfs_ops in struct kobj_type	2010-03-07 17:04:49 -08:00
zorro
Kconfig	MFGPT: move clocksource menu	2010-03-06 11:26:28 -08:00
Makefile	Merge branch 'origin' into devel-stable	2010-03-08 20:21:04 +00:00