diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2011-01-24 09:39:17 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2011-01-24 09:39:17 +0000 |
| commit | cf3d4be590f2f42a2baf578ef6c5723fc1596fea (patch) | |
| tree | 5a6b44c4beb64b4ba3bd9b6069d042cfd1c37713 /target/linux | |
| parent | 832fc4a1330f3e29e4df0118652ffdd9d1993056 (diff) | |
| download | upstream-cf3d4be590f2f42a2baf578ef6c5723fc1596fea.tar.gz upstream-cf3d4be590f2f42a2baf578ef6c5723fc1596fea.tar.bz2 upstream-cf3d4be590f2f42a2baf578ef6c5723fc1596fea.zip | |
refresh 2.6.38 patches with -rc2
SVN-Revision: 25081
Diffstat (limited to 'target/linux')
8 files changed, 7 insertions, 18 deletions
diff --git a/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch b/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch index eb330b10b9..2e9a6e5328 100644 --- a/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch +++ b/target/linux/generic/patches-2.6.38/021-mips_image_cmdline_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -904,6 +904,10 @@ config SYNC_R4K +@@ -901,6 +901,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch b/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch index faf0f79a69..10b4468635 100644 --- a/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch +++ b/target/linux/generic/patches-2.6.38/025-mips_disable_fpu.patch @@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> -- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -889,6 +889,17 @@ config I8259 +@@ -886,6 +886,17 @@ config I8259 config MIPS_BONITO64 bool diff --git a/target/linux/generic/patches-2.6.38/420-gpiodev.patch b/target/linux/generic/patches-2.6.38/420-gpiodev.patch index 6aa65c9256..5c1f3a6c28 100644 --- a/target/linux/generic/patches-2.6.38/420-gpiodev.patch +++ b/target/linux/generic/patches-2.6.38/420-gpiodev.patch @@ -17,7 +17,7 @@ depends on BLOCK --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -82,6 +82,7 @@ obj-$(CONFIG_NWFLASH) += nwflash.o +@@ -69,6 +69,7 @@ obj-$(CONFIG_NWFLASH) += nwflash.o obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o diff --git a/target/linux/generic/patches-2.6.38/840-unable_to_open_console.patch b/target/linux/generic/patches-2.6.38/840-unable_to_open_console.patch index 8f1a4cb8ed..767f777d1d 100644 --- a/target/linux/generic/patches-2.6.38/840-unable_to_open_console.patch +++ b/target/linux/generic/patches-2.6.38/840-unable_to_open_console.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -890,7 +890,7 @@ static int __init kernel_init(void * unu +@@ -899,7 +899,7 @@ static int __init kernel_init(void * unu /* Open the /dev/console on the rootfs, this should never fail */ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) diff --git a/target/linux/generic/patches-2.6.38/922-gpiommc.patch b/target/linux/generic/patches-2.6.38/922-gpiommc.patch index e925e57204..fe27f3b6e5 100644 --- a/target/linux/generic/patches-2.6.38/922-gpiommc.patch +++ b/target/linux/generic/patches-2.6.38/922-gpiommc.patch @@ -829,7 +829,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2851,6 +2851,11 @@ T: git git://git.kernel.org/pub/scm/linu +@@ -2855,6 +2855,11 @@ T: git git://git.kernel.org/pub/scm/linu S: Maintained F: drivers/media/video/gspca/ diff --git a/target/linux/generic/patches-2.6.38/980-vm_exports.patch b/target/linux/generic/patches-2.6.38/980-vm_exports.patch index 37a4dd0063..4d10bc81c2 100644 --- a/target/linux/generic/patches-2.6.38/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.38/980-vm_exports.patch @@ -122,7 +122,7 @@ void *caller) --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -854,6 +854,7 @@ extern void show_free_areas(void); +@@ -856,6 +856,7 @@ extern void show_free_areas(void); int shmem_lock(struct file *file, int lock, struct user_struct *user); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); diff --git a/target/linux/generic/patches-2.6.38/997-lzo_decompressor_fix.patch b/target/linux/generic/patches-2.6.38/997-lzo_decompressor_fix.patch deleted file mode 100644 index aab44ca91e..0000000000 --- a/target/linux/generic/patches-2.6.38/997-lzo_decompressor_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/usr/Kconfig -+++ b/usr/Kconfig -@@ -84,7 +84,7 @@ config RD_XZ - config RD_LZO - bool "Support initial ramdisks compressed using LZO" if EMBEDDED - default !EMBEDDED -- depends on BLK_DEV_INITRD -+ depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO - select DECOMPRESS_LZO - help - Support loading of a LZO encoded initial ramdisk or cpio buffer diff --git a/target/linux/generic/patches-2.6.38/999-use_preinit_as_init.patch b/target/linux/generic/patches-2.6.38/999-use_preinit_as_init.patch index d58bb30d01..d46c13b334 100644 --- a/target/linux/generic/patches-2.6.38/999-use_preinit_as_init.patch +++ b/target/linux/generic/patches-2.6.38/999-use_preinit_as_init.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -843,10 +843,7 @@ static noinline int init_post(void) +@@ -852,10 +852,7 @@ static noinline int init_post(void) printk(KERN_WARNING "Failed to execute %s. Attempting " "defaults...\n", execute_command); } |