[kernel] r11865 - in dists/trunk/linux-2.6/debian: . patches/bugfix/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Mon Jul 21 08:51:57 2008
New Revision: 11865

Log:
Fix a boot crash on the Kurobox Pro.


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/kurobox_fix_nr_controllers.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jul 21 08:51:57 2008
@@ -99,6 +99,7 @@
   * [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.

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/kurobox_fix_nr_controllers.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/kurobox_fix_nr_controllers.patch	Mon Jul 21 08:51:57 2008
@@ -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,

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Mon Jul 21 08:51:57 2008
@@ -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