diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-10-23 12:13:00 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-10-23 12:13:00 +0000 |
| commit | 21367682e8ab9be4fda6b134c385e482b2ecf4d8 (patch) | |
| tree | a6cf8247c78c71f0ae35ce42338dd33329e82c68 /target/linux/x86 | |
| parent | d4b251bdb8c014b7fbe3ef19448a75c3e4525efa (diff) | |
| download | upstream-21367682e8ab9be4fda6b134c385e482b2ecf4d8.tar.gz upstream-21367682e8ab9be4fda6b134c385e482b2ecf4d8.tar.bz2 upstream-21367682e8ab9be4fda6b134c385e482b2ecf4d8.zip | |
update to 2.6.31.5
SVN-Revision: 18127
Diffstat (limited to 'target/linux/x86')
| -rw-r--r-- | target/linux/x86/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/x86/patches-2.6.31/100-pata_sc1200-wrap.patch | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 59247a4c49..8999395818 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz SUBTARGETS=generic -LINUX_VERSION:=2.6.31.1 +LINUX_VERSION:=2.6.31.5 include $(INCLUDE_DIR)/target.mk 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 691d1ca852..edd925fbe4 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,5 +1,7 @@ ---- a/drivers/ata/pata_sc1200.c -+++ b/drivers/ata/pata_sc1200.c +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 @@ .port_ops = &sc1200_port_ops }; |