diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /arch/arm/mach-ixp23xx/espresso.c | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
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 2327c9790416..bf688c128630 100644 --- a/arch/arm/mach-ixp23xx/espresso.c +++ b/arch/arm/mach-ixp23xx/espresso.c | |||
| @@ -44,6 +44,15 @@ | |||
| 44 | #include <asm/mach/irq.h> | 44 | #include <asm/mach/irq.h> |
| 45 | #include <asm/mach/pci.h> | 45 | #include <asm/mach/pci.h> |
| 46 | 46 | ||
| 47 | static int __init espresso_pci_init(void) | ||
| 48 | { | ||
| 49 | if (machine_is_espresso()) | ||
| 50 | ixp23xx_pci_slave_init(); | ||
| 51 | |||
| 52 | return 0; | ||
| 53 | }; | ||
| 54 | subsys_initcall(espresso_pci_init); | ||
| 55 | |||
| 47 | static void __init espresso_init(void) | 56 | static void __init espresso_init(void) |
| 48 | { | 57 | { |
| 49 | physmap_configure(0x90000000, 0x02000000, 2, NULL); | 58 | physmap_configure(0x90000000, 0x02000000, 2, NULL); |