x86, olpc: Use pci subarch init for OLPC
authorThomas Gleixner <tglx@linutronix.de>
Mon, 22 Feb 2010 13:42:04 +0000 (05:42 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 26 Feb 2010 03:26:23 +0000 (19:26 -0800)
commitd5d0e88c1e5b069aadb050ff6ec95df312de876a
tree3ad3e5964cc7db89e7fbdb480be611e1193222ca
parent4fb6088a5cb3a77123fea1279bf2d5b16cf27648
x86, olpc: Use pci subarch init for OLPC

Replace the #ifdef'ed OLPC-specific init functions by a conditional
x86_init function.  If the function returns 0 we leave pci_arch_init,
otherwise we continue.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Andres Salomon <dilinger@collabora.co.uk>
LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318CE89@orsmsx508.amr.corp.intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/include/asm/olpc.h
arch/x86/include/asm/pci_x86.h
arch/x86/kernel/olpc.c
arch/x86/pci/init.c
arch/x86/pci/olpc.c