diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 16:10:34 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 16:10:34 -0500 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /arch/arm/mach-ixp23xx/espresso.c | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
| download | op-kernel-dev-12df7556705aae97f24a397377e17898700d7192.zip op-kernel-dev-12df7556705aae97f24a397377e17898700d7192.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-ixp23xx/espresso.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/espresso.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp23xx/espresso.c b/arch/arm/mach-ixp23xx/espresso.c index 2327c97..bf688c1 100644 --- a/arch/arm/mach-ixp23xx/espresso.c +++ b/arch/arm/mach-ixp23xx/espresso.c @@ -44,6 +44,15 @@ #include <asm/mach/irq.h> #include <asm/mach/pci.h> +static int __init espresso_pci_init(void) +{ + if (machine_is_espresso()) + ixp23xx_pci_slave_init(); + + return 0; +}; +subsys_initcall(espresso_pci_init); + static void __init espresso_init(void) { physmap_configure(0x90000000, 0x02000000, 2, NULL); |
