[kernel] r11109 - dists/trunk/linux-2.6/debian/patches/features/arm

[Martin Michlmayr]

Author: tbm
Date: Sun Apr 20 12:56:46 2008
New Revision: 11109

Log:
fix patch conflict


Modified:
   dists/trunk/linux-2.6/debian/patches/features/arm/linkstation.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/linkstation.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/linkstation.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/linkstation.patch	Sun Apr 20 12:56:46 2008
@@ -15,13 +15,11 @@
  arch/arm/mach-orion/kurobox_pro-setup.c |   25 +++++++++++++++++++------
  3 files changed, 28 insertions(+), 6 deletions(-)
 
-diff --git a/arch/arm/mach-orion/Kconfig b/arch/arm/mach-orion/Kconfig
-index 1dcbb6a..dbc646f 100644
---- a/arch/arm/mach-orion/Kconfig
-+++ b/arch/arm/mach-orion/Kconfig
-@@ -36,6 +36,14 @@ config MACH_TS209
+--- a/arch/arm/mach-orion/Kconfig~	2008-04-20 12:55:33.000000000 +0000
++++ b/arch/arm/mach-orion/Kconfig	2008-04-20 12:56:39.000000000 +0000
+@@ -23,6 +23,14 @@
  	  Say 'Y' here if you want your kernel to support the
- 	  QNAP TS-109/TS-209 platform.
+ 	  KuroBox Pro platform.
  
 +config MACH_LINKSTATION_PRO
 +	bool "Buffalo Linkstation Pro/Live"
@@ -31,9 +29,9 @@
 +	  Buffalo Linkstation Pro/Live platform. Both v1 and
 +	  v2 devices are supported.
 +
- endmenu
- 
- endif
+ config MACH_DNS323
+ 	bool "D-Link DNS-323"
+ 	select I2C_BOARDINFO
 diff --git a/arch/arm/mach-orion/Makefile b/arch/arm/mach-orion/Makefile
 index f91d937..98378dc 100644
 --- a/arch/arm/mach-orion/Makefile