diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 13:43:45 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 13:43:45 +0200 |
| commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
| tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | |
| parent | omap: Fix DEBUG_LL uart to access phys addr when MMU isn't enable (diff) | |
| parent | omap3: introduce omap3_map_io (diff) | |
| download | linux-7590d1defdc720a97a9e186f45f529c4ae1b40f7.tar.xz linux-7590d1defdc720a97a9e186f45f529c4ae1b40f7.zip | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-kirkwood/rd88f6192-nas-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c index 3bf6304158f6..c34718c2cfe5 100644 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c @@ -71,7 +71,7 @@ static void __init rd88f6192_init(void) static int __init rd88f6192_pci_init(void) { if (machine_is_rd88f6192_nas()) - kirkwood_pcie_init(); + kirkwood_pcie_init(KW_PCIE0); return 0; } |