Rafael J. Wysocki
fc8fe1e992
PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset
...
After commit 415e12b237 ("PCI/ACPI: Request _OSC control once for each
root bridge (v3)") include/linux/pci-acpi.h is included by
drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the bogus and
unnecessary alternative definition of acpi_find_root_bridge_handle()
causes a build error to occur.
Remove the offending piece of garbage.
Reported-and-tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-16 11:56:26 -08:00
..
acpi
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2011-01-14 09:29:05 -08:00
asm-generic
thp: mm: define MADV_NOHUGEPAGE
2011-01-13 17:32:47 -08:00
crypto
crypto: padlock - Move padlock.h into include/crypto
2011-01-07 14:52:00 +11:00
drm
Revert "drm: Update fbdev fb_fix_screeninfo"
2011-01-14 16:10:28 -08:00
keys
keys: add new key-type encrypted
2010-11-29 08:55:29 +11:00
linux
PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset
2011-01-16 11:56:26 -08:00
math-emu
media
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
mtd
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-01-14 13:25:30 -08:00
pcmcia
rdma
rxrpc
scsi
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
sound
Merge branch 'topic/asoc' into for-linus
2011-01-13 08:37:24 +01:00
target
[SCSI] target: Add LIO target core v4.0.0-rc6
2011-01-14 10:12:29 -06:00
trace
Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-01-15 12:45:00 -08:00
video
Merge branch 'fbdev/udlfb'
2011-01-06 18:10:09 +09:00
xen
Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2011-01-13 18:46:48 -08:00
Kbuild