[x86] add olpc 2.6.31 configuration, forward port the block2mtd patch, refresh patches

[openwrt.git] / target / linux / x86 / patches-2.6.31 / 100-pata_sc1200-wrap.patch

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 edd925f..066694b 100644 (file)
--- 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 */