[kernel] r17061 - dists/squeeze/linux-2.6/debian/patches/bugfix/mips

[Ben Hutchings]

Author: benh
Date: Sat Mar 12 21:10:04 2011
New Revision: 17061

Log:
Fix line numbers in bugfix/mips/enable-pata-platform.patch

The line numbers are not quite correct for 2.6.32, and because there
are several very similar sets of config entries in arch/mips/Kconfig
it is possible for the patch hunks to be applied in the wrong places.
In fact, this has happened to the second hunk in the git mirror.

Modified:
   dists/squeeze/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch	Sat Mar 12 20:47:33 2011	(r17060)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/mips/enable-pata-platform.patch	Sat Mar 12 21:10:04 2011	(r17061)
@@ -18,11 +18,9 @@
  arch/mips/Kconfig |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 29e8692..98628ec 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -509,6 +509,7 @@ config SIBYTE_SWARM
+@@ -499,6 +499,7 @@ config SIBYTE_SWARM
  	bool "Sibyte BCM91250A-SWARM"
  	select BOOT_ELF32
  	select DMA_COHERENT
@@ -30,7 +28,7 @@
  	select NR_CPUS_DEFAULT_2
  	select SIBYTE_SB1250
  	select SWAP_IO_SPACE
-@@ -523,6 +524,7 @@ config SIBYTE_LITTLESUR
+@@ -513,6 +514,7 @@ config SIBYTE_LITTLESUR
  	depends on EXPERIMENTAL
  	select BOOT_ELF32
  	select DMA_COHERENT
@@ -38,6 +36,3 @@
  	select NR_CPUS_DEFAULT_2
  	select SIBYTE_SB1250
  	select SWAP_IO_SPACE
--- 
-1.7.1
-