diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-11-12 17:49:01 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-11-12 17:49:01 +0000 |
| commit | 88cda758c321f0b56556d425daca5c59066eb31a (patch) | |
| tree | 49f8dc36553952cfaba9a6d83236d549db7191d7 /target/linux/olpc | |
| parent | 9d0f42d50ad05f35801ff2c2bc9f05ecc7eb4b9b (diff) | |
| download | upstream-88cda758c321f0b56556d425daca5c59066eb31a.tar.gz upstream-88cda758c321f0b56556d425daca5c59066eb31a.tar.bz2 upstream-88cda758c321f0b56556d425daca5c59066eb31a.zip | |
update to 2.6.25.20, 2.6.26.8, 2.6.27.5 and refresh patches * based on a patch by Hauke Mehrtens * closes #4193
SVN-Revision: 13192
Diffstat (limited to 'target/linux/olpc')
| -rw-r--r-- | target/linux/olpc/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/olpc/Makefile b/target/linux/olpc/Makefile index 1ece675b8f..455031a9fd 100644 --- a/target/linux/olpc/Makefile +++ b/target/linux/olpc/Makefile @@ -11,7 +11,7 @@ BOARD:=olpc BOARDNAME:=OLPC XO-1 FEATURES:=squashfs ext2 -LINUX_VERSION:=2.6.27.4 +LINUX_VERSION:=2.6.27.5 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci diff --git a/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch b/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch index dc7f7dfba7..e16570fdd1 100644 --- a/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch +++ b/target/linux/olpc/patches-2.6.27/300-block2mtd_init.patch @@ -69,7 +69,7 @@ static struct page *page_read(struct address_space *mapping, int index) { -@@ -510,7 +542,9 @@ static int block2mtd_setup2(const char *val) +@@ -510,7 +542,9 @@ static int block2mtd_setup2(const char * if (token[2] && (strlen(token[2]) + 1 > 80)) parse_err("mtd device name too long"); @@ -100,7 +100,7 @@ VMLINUX_SYMBOL(__per_cpu_start) = .; \ --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -174,16 +174,8 @@ static int __init fs_names_setup(char *str) +@@ -174,16 +174,8 @@ static int __init fs_names_setup(char *s return 1; } @@ -185,7 +185,7 @@ static int __init kernel_init(void * unused) { lock_kernel(); -@@ -873,7 +882,16 @@ static int __init kernel_init(void * unused) +@@ -873,7 +882,16 @@ static int __init kernel_init(void * unu if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { ramdisk_execute_command = NULL; |