From 9d669683f46849d94649e9337db1ffe847bff367 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Mon, 21 Jul 2008 08:51:57 +0000 Subject: [PATCH] Fix a boot crash on the Kurobox Pro. svn path=/dists/trunk/linux-2.6/; revision=11865 --- debian/changelog | 1 + .../bugfix/arm/kurobox_fix_nr_controllers.patch | 16 ++++++++++++++++ debian/patches/series/1~experimental.1 | 1 + 3 files changed, 18 insertions(+) create mode 100644 debian/patches/bugfix/arm/kurobox_fix_nr_controllers.patch diff --git a/debian/changelog b/debian/changelog index bd6002531..8e4b9553a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,7 @@ linux-2.6 (2.6.26-1~experimental.1) UNRELEASED; urgency=low * [arm/ixp4xx] Enable CONFIG_MACH_DSMG600. * [arm/iop32x] Unset NET_DMA since it actually leads to worse network performance. + * [arm/orion5x] Fix a boot crash on the Kurobox Pro. [ Ian Campbell ] * Readme.build updated on how to generate orig tarballs. diff --git a/debian/patches/bugfix/arm/kurobox_fix_nr_controllers.patch b/debian/patches/bugfix/arm/kurobox_fix_nr_controllers.patch new file mode 100644 index 000000000..e1ef72a69 --- /dev/null +++ b/debian/patches/bugfix/arm/kurobox_fix_nr_controllers.patch @@ -0,0 +1,16 @@ +Otherwise the machine won't boot because of problems with PCI +initalization. + +diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c +index 84feac4..35706b4 100644 +--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c ++++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c +@@ -137,7 +137,7 @@ static int __init kurobox_pro_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) + } + + static struct hw_pci kurobox_pro_pci __initdata = { +- .nr_controllers = 2, ++ .nr_controllers = 1, + .swizzle = pci_std_swizzle, + .setup = orion5x_pci_sys_setup, + .scan = orion5x_pci_sys_scan_bus, diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index bc0ef108c..aa6cd5fe1 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -33,6 +33,7 @@ + bugfix/arm/disable-ath5k.patch + bugfix/arm/disable-r6040.patch + bugfix/arm/ixp4xx_napi_fix.patch ++ bugfix/arm/kurobox_fix_nr_controllers.patch + features/arm/speed_flush_cache.patch + features/arm/5281d0.patch + features/arm/fix_cache_alignment.patch