[kernel] r12356 - dists/sid/linux-2.6/debian/patches/features/arm

[Martin Michlmayr]

Author: tbm
Date: Fri Oct 24 07:17:57 2008
New Revision: 12356

Log:
up


Modified:
   dists/sid/linux-2.6/debian/patches/features/arm/dns323_revb1.patch

Modified: dists/sid/linux-2.6/debian/patches/features/arm/dns323_revb1.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/dns323_revb1.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/features/arm/dns323_revb1.patch	Fri Oct 24 07:17:57 2008
@@ -29,7 +29,7 @@
  
  	return 0;
  }
-@@ -204,6 +215,13 @@
+@@ -268,6 +279,13 @@
  	.dev		= { .platform_data  = &dns323_button_data, },
  };
  
@@ -43,7 +43,7 @@
  /****************************************************************************
   * General Setup
   */
-@@ -247,6 +265,11 @@
+@@ -311,6 +329,11 @@
  
  static void __init dns323_init(void)
  {
@@ -55,7 +55,7 @@
  	/* Setup basic Orion functions. Need to be called early. */
  	orion5x_init();
  
-@@ -262,11 +285,21 @@
+@@ -326,11 +349,21 @@
  	orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
  				ORION5X_PCIE_WA_SIZE);
  
@@ -82,9 +82,9 @@
  
  	/* Define used GPIO pins
  
-@@ -306,6 +339,11 @@
- 				ARRAY_SIZE(dns323_i2c_devices));
- 
+@@ -373,6 +406,11 @@
+ 		printk("ERROR: Failed to read MAC address\n");
+ 		
  	orion5x_eth_init(&dns323_eth_data);
 +	/* The 5182 has it's SATA controller internally, and it needs it's own
 +	 * little init routine.