Arnd Bergmann
59596df640
omap-rng: fix use of SIMPLE_DEV_PM_OPS
...
omap_rng_suspend and omap_rng_resume are unused if CONFIG_PM is enabled
but CONFIG_PM_SLEEP is disabled. I found this while building all defconfig
files on ARM. It's not clear to me if this is the right solution, but
at least it makes the code consistent again.
Without this patch, building omap1_defconfig results in:
drivers/char/hw_random/omap-rng.c:165:12: warning: 'omap_rng_suspend' defined but not used [-Wunused-function]
drivers/char/hw_random/omap-rng.c:171:12: warning: 'omap_rng_resume' defined but not used [-Wunused-function]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kevin Hilman <khilman@ti.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
2012-08-10 12:28:05 +02:00
..
accessibility
acpi
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
amba
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
ata
ARM: arm-soc Marvell Orion device-tree updates
2012-08-02 11:50:24 -07:00
atm
auxdisplay
base
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
bcma
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2012-07-27 11:15:03 -04:00
block
Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block
2012-08-01 09:06:47 -07:00
bluetooth
cdrom
char
omap-rng: fix use of SIMPLE_DEV_PM_OPS
2012-08-10 12:28:05 +02:00
clk
clk: validate pointer in __clk_disable()
2012-07-30 17:25:13 -07:00
clocksource
connector
cpufreq
ARM: arm-soc soc updates, take 2
2012-07-30 09:45:53 -07:00
cpuidle
crypto
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
dca
devfreq
dio
dma
SuperH fixes for 3.6-rc1 merge window
2012-08-02 11:45:42 -07:00
edac
Merge branch 'devel'
2012-07-29 21:11:05 -03:00
eisa
extcon
MFD bits for the 3.6 merge window.
2012-07-30 12:41:17 -07:00
firewire
- Small fixes and optimizations.
2012-07-30 09:32:39 -07:00
firmware
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
gpio
gpio: em: do not discard em_gio_irq_domain_cleanup
2012-08-10 12:27:46 +02:00
gpu
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-30 10:06:23 -07:00
hid
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-31 18:47:44 -07:00
hsi
hv
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
hwmon
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2012-07-30 10:10:26 -07:00
hwspinlock
i2c
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
ide
idle
ieee802154
iio
infiniband
Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next
2012-07-30 07:47:27 -07:00
input
This patch series contains a major revamp of how we collect entropy
2012-07-31 19:07:42 -07:00
iommu
isdn
mISDN: Bugfix only few bytes are transfered on a connection
2012-07-29 23:18:30 -07:00
leds
lguest
macintosh
md
Additional md update for 3.6
2012-08-02 11:34:40 -07:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-31 18:47:44 -07:00
memory
memstick
message
drivers/message/i2o/i2o_config.c: bound allocation
2012-07-30 17:25:17 -07:00
mfd
mfd/asic3: fix asic3_mfd_probe return value
2012-08-08 21:13:00 +02:00
misc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
mmc
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
2012-08-01 16:41:07 -07:00
mtd
mtd/omap2: fix dmaengine_slave_config error handling
2012-08-10 12:27:46 +02:00
net
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
2012-08-02 11:52:39 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci
pcmcia
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-07-27 15:14:26 -07:00
pinctrl
platform
Platform: OLPC: move global variables into priv struct
2012-07-31 23:27:31 -04:00
pnp
power
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
2012-08-02 11:52:39 -07:00
pps
pps: return PTR_ERR on error in device_create
2012-07-30 17:25:21 -07:00
ps3
ptp
pwm
rapidio
regulator
regulator: Fix an s5m8767 build failure
2012-07-31 00:51:09 +02:00
remoteproc
rpmsg
rtc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
s390
sbus
scsi
Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block
2012-08-01 09:02:41 -07:00
sfi
sh
Merge branch 'common/irqdomain' into sh-latest
2012-08-01 17:14:52 +09:00
sn
spi
spi/s3c64xx: improve error handling
2012-08-10 12:27:47 +02:00
ssb
staging
Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc
2012-08-02 11:52:39 -07:00
target
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-08-01 10:26:23 -07:00
tc
thermal
The tag contains just a few battery-related changes for v3.6. It's is
2012-07-31 18:08:25 -07:00
tty
serial: sh-sci: fix compilation breakage, when DMA is enabled
2012-08-01 13:48:54 +09:00
uio
usb
usb/ohci-omap: remove unused variable
2012-08-08 21:13:01 +02:00
uwb
vfio
vfio: Add PCI device driver
2012-07-31 08:16:24 -06:00
vhost
video
fbdev updates for 3.6
2012-08-01 10:45:12 -07:00
virt
virtio
vlynq
vme
w1
watchdog
ARM: arm-soc Marvell Orion device-tree updates
2012-08-02 11:50:24 -07:00
xen
zorro
Kconfig
vfio: VFIO core
2012-07-31 08:16:22 -06:00
Makefile
vfio: VFIO core
2012-07-31 08:16:22 -06:00