]> err.no Git - linux-2.6/commit
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
authorAndres Salomon <dilinger@queued.net>
Thu, 5 Jun 2008 21:14:41 +0000 (14:14 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 5 Jun 2008 21:29:25 +0000 (14:29 -0700)
commit2bdd1b031b200d55c2512c8d7e0e9bdcf85d011f
tree519d34fdd9f286c933ab7d747b6ef92f0a3842fe
parent53c8ba95402be65d412a806cda3430f0e72cd107
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

Previously, one would have to specifically choose CONFIG_OLPC and
CONFIG_PCI_GOOLPC in order to enable PCI_OLPC.  That doesn't really work
for distro kernels, so this patch allows one to choose CONFIG_OLPC and
CONFIG_PCI_GOANY in order to build in OLPC support in a generic kernel (as
requested by Robert Millan).

This also moves GOOLPC before GOANY in the menuconfig list.

Finally, make pci_access_init return early if we detect OLPC hardware.
There's no need to continue probing stuff, and pci_pcbios_init
specifically trashes our settings (we didn't run into that before because
PCI_GOANY wasn't supported).

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
arch/x86/Kconfig
arch/x86/pci/init.c
arch/x86/pci/olpc.c
arch/x86/pci/pci.h