debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

fix patch conflict 

svn path=/dists/trunk/linux-2.6/; revision=11109
This commit is contained in:
Martin Michlmayr 2008-04-20 12:56:46 +00:00
parent 909de43481
commit 29f494c902
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/patches/features/arm/linkstation.patch vendored
View File

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