diff options
Diffstat (limited to 'target/linux/generic')
7 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch b/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch index ddc27b104..4af122e11 100644 --- a/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch +++ b/target/linux/generic/patches-3.7/010-mtd_mp25p80_add_gd25q32_gd25q64.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -651,6 +651,10 @@ +@@ -645,6 +645,10 @@ static const struct spi_device_id m25p_i /* Everspin */ - { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) }, + { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2) }, + /* GigaDevice */ + { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) }, diff --git a/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch index 2459b6183..99411ac73 100644 --- a/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch +++ b/target/linux/generic/patches-3.7/340-module_alloc_size_check.patch @@ -1,6 +1,6 @@ --- a/kernel/module.c +++ b/kernel/module.c -@@ -2378,12 +2378,15 @@ static void dynamic_debug_remove(struct +@@ -2398,12 +2398,15 @@ static void dynamic_debug_remove(struct void * __weak module_alloc(unsigned long size) { diff --git a/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch index 5ad171346..28e2fa80c 100644 --- a/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch +++ b/target/linux/generic/patches-3.7/470-mtd_m25p80_add_pm25lv_flash_support.patch @@ -16,7 +16,7 @@ }; #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags) \ -@@ -667,6 +669,10 @@ static const struct spi_device_id m25p_i +@@ -671,6 +673,10 @@ static const struct spi_device_id m25p_i { "n25q128", INFO(0x20ba18, 0, 64 * 1024, 256, 0) }, { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) }, @@ -27,7 +27,7 @@ /* Spansion -- single (large) sector size only, at least * for the chips listed here (without boot sectors). */ -@@ -907,6 +913,9 @@ static int __devinit m25p_probe(struct s +@@ -911,6 +917,9 @@ static int __devinit m25p_probe(struct s if (info->flags & SECT_4K) { flash->erase_opcode = OPCODE_BE_4K; flash->mtd.erasesize = 4096; diff --git a/target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch b/target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch index 7466f3b87..293b6f21b 100644 --- a/target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch +++ b/target/linux/generic/patches-3.7/473-mtd_m25p80_add_w25q128.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -751,6 +751,7 @@ static const struct spi_device_id m25p_i +@@ -755,6 +755,7 @@ static const struct spi_device_id m25p_i { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, diff --git a/target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch index 2a2541bff..58d8d0636 100644 --- a/target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch +++ b/target/linux/generic/patches-3.7/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch @@ -30,7 +30,7 @@ /****************************************************************************/ struct m25p { -@@ -911,7 +917,7 @@ static int __devinit m25p_probe(struct s +@@ -915,7 +921,7 @@ static int __devinit m25p_probe(struct s flash->mtd._write = m25p80_write; /* prefer "small sector" erase if possible */ diff --git a/target/linux/generic/patches-3.7/920-unable_to_open_console.patch b/target/linux/generic/patches-3.7/920-unable_to_open_console.patch index f9e12ac61..731fe457a 100644 --- a/target/linux/generic/patches-3.7/920-unable_to_open_console.patch +++ b/target/linux/generic/patches-3.7/920-unable_to_open_console.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -877,7 +877,7 @@ static void __init kernel_init_freeable( +@@ -877,7 +877,7 @@ static noinline void __init kernel_init_ /* 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-3.7/950-vm_exports.patch b/target/linux/generic/patches-3.7/950-vm_exports.patch index f1bf3e8a5..85126e4d6 100644 --- a/target/linux/generic/patches-3.7/950-vm_exports.patch +++ b/target/linux/generic/patches-3.7/950-vm_exports.patch @@ -59,7 +59,7 @@ * When we die, we re-parent all our children, and try to: --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -3565,6 +3565,7 @@ int can_nice(const struct task_struct *p +@@ -3566,6 +3566,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } |