Liam Girdwood 7c314991d7 regulator: build fix for powerpc - renamed show_state ... This patch fixes the follwing build failure on powerpc:- > Today's linux-next build (powerpc allyesconfig) failed like this: > > drivers/regulator/userspace-consumer.c:43: error: conflicting types > for 'show_state' > include/linux/sched.h:273: note: previous definition of 'show_state' > was here > > Caused by commit 5defa2bce704ca4151cfe24e4297aa7797cafd22 ("regulator: > add userspace-consumer driver") which I have reverted for today. Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>		2009-06-15 11:18:23 +01:00
..
accessibility
acpi
amba
ata	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
atm
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
bluetooth
cdrom
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
clocksource
connector	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
cpufreq
cpuidle
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
dca
dio
dma
edac	trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.	2009-06-12 18:01:46 +02:00
eisa
firewire
firmware
gpio
gpu	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-06-12 18:09:18 -07:00
hid	Merge branches 'upstream' and 'ntrig-multitouch' into for-linus	2009-06-12 17:42:13 +02:00
hwmon
i2c	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
ide	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
idle
ieee1394
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2009-06-14 13:53:22 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
isdn	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
leds
lguest	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest	2009-06-12 09:32:26 -07:00
macintosh
mca
md
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
memstick
message	fusion: fix recent kernel-doc problems	2009-06-14 13:52:01 -07:00
mfd	MFD,mmc: tmio_mmc: make HCLK configurable	2009-06-13 22:42:59 +02:00
misc	cb710: more cleanup for the DEBUG case.	2009-06-13 22:42:59 +02:00
mmc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2009-06-14 13:46:57 -07:00
mtd	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2009-06-14 13:53:22 -07:00
nubus
of
oprofile
parisc
parport
pci	trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug	2009-06-12 18:01:51 +02:00
pcmcia
platform
pnp	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-06-12 18:09:18 -07:00
power
ps3
rapidio
regulator	regulator: build fix for powerpc - renamed show_state	2009-06-15 11:18:23 +01:00
rtc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
sbus
scsi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
serial	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
sh
sn
spi	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
ssb
staging	trivial: fix ETIMEOUT -> ETIMEDOUT typos	2009-06-12 18:01:50 +02:00
tc
telephony
thermal
uio
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
uwb
video	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-06-14 13:42:43 -07:00
virtio	virtio: enhance id_matching for virtio drivers	2009-06-12 22:16:40 +09:30
w1	trivial: Kconfig: .ko is normally not included in module names	2009-06-12 18:01:50 +02:00
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
xen	PM core: rename suspend and resume functions	2009-06-12 21:32:31 +02:00
zorro
Kconfig
Makefile