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

Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-06-10 15:25:41 -07:00

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

Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)

2009-04-13 15:04:33 -07:00

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

tty: fix bluetooth scribbling on low latency flags

2009-06-11 08:51:05 -07:00

cdrom

block: Use accessor functions for queue limits

2009-05-22 23:22:54 +02:00

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

clocksource: sh_mtu2/cmt_register() should be static.

2009-05-03 18:05:42 +09:00

connector

trivial: Kconfig: .ko is normally not included in module names

2009-06-12 18:01:50 +02:00

cpufreq

cpumask: alloc zeroed cpumask for static cpumask_var_ts

2009-06-09 22:30:27 +09:30

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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2009-05-30 07:57:44 -07:00

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

[libata] ahci: Restore SB600 SATA controller 64 bit DMA

2009-06-10 11:05:00 -04:00

gpio

microblaze: Kconfig: Enable drivers for Microblaze

2009-05-21 15:56:04 +02:00

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

hwmon: (lm78) Add missing __devexit_p()

2009-06-01 13:46:49 +02:00

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

i7300_idle: allow testing on i5000-series hardware w/o re-compile

2009-05-28 20:52:40 -04:00

ieee1394

fs: Remove i_cindex from struct inode

2009-06-11 21:36:09 -04:00

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

[ARM] S3C24XX: GPIO: Move gpio functions out of <mach/hardware.h>

2009-05-18 16:25:40 +01:00

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

2009-04-24 08:16:05 -07:00

mca

…

md

Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block

2009-06-11 11:10:35 -07:00

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

block: Do away with the notion of hardsect_size

2009-05-22 23:22:54 +02:00

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

microblaze: Kconfig: Enable drivers for Microblaze

2009-05-21 15:56:04 +02:00

oprofile

oprofile: fix cpu buffer size

2009-05-07 17:28:59 +02:00

parisc

irq: change ->set_affinity() to return status

2009-04-28 12:21:16 +02:00

parport

parport_pc: clean up the modified while loops using for

2009-06-11 08:51:03 -07:00

pci

trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug

2009-06-12 18:01:51 +02:00

pcmcia

[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA

2009-06-05 10:46:32 +08:00

platform

eeepc-laptop: unregister_rfkill_notifier on failure

2009-05-14 11:28:27 -04:00

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

Merge git://git.infradead.org/battery-2.6

2009-04-08 17:45:02 -07:00

ps3

…

rapidio

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

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

block: implement and enforce request peek/start/fetch

2009-05-11 09:52:18 +02:00

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

sh: Tie sparseirq in to Kconfig.

2009-06-11 10:33:09 +03:00

sn

dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)

2009-04-07 08:31:10 -07:00

spi

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2009-06-14 13:42:43 -07:00

ssb

SSB: BCM47xx: Export ssb_watchdog_timer_set

2009-06-08 16:57:50 +01:00

staging

trivial: fix ETIMEOUT -> ETIMEDOUT typos

2009-06-12 18:01:50 +02:00

tc

…

telephony

…

thermal

thermal: fix off-by-1 error in trip point trigger condition

2009-05-14 13:40:53 -04:00

uio

UIO: fix specific device driver missing statement for depmod

2009-04-16 16:17:11 -07:00

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

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

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

V4L/DVB (11561a): move media after i2c

2009-04-29 15:41:13 -03:00