summaryrefslogtreecommitdiffstats
path: root/target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-07 12:32:25 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-11-07 12:32:25 +0000
commit90c331955e27db6451a576297b3ae055a7d7699f (patch)
tree3ae1f8e62ee85126064b6b442f820c3f39bdc2a0 /target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch
parentbbd135050c78c9ae217a66f263d22fb3bf9ea99b (diff)
[x86] add olpc 2.6.31 configuration, forward port the block2mtd patch, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18333 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch')
-rw-r--r--target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch b/target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch
index edd925fbe..066694b35 100644
--- a/target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch
+++ b/target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.31.5/drivers/ata/pata_sc1200.c
-===================================================================
---- linux-2.6.31.5.orig/drivers/ata/pata_sc1200.c 2009-10-23 00:57:56.000000000 +0200
-+++ linux-2.6.31.5/drivers/ata/pata_sc1200.c 2009-10-23 12:45:54.000000000 +0200
-@@ -236,7 +236,7 @@
+--- a/drivers/ata/pata_sc1200.c
++++ b/drivers/ata/pata_sc1200.c
+@@ -236,7 +236,7 @@ static int sc1200_init_one(struct pci_de
.port_ops = &sc1200_port_ops
};
/* Can't enable port 2 yet, see top comments */