diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-19 11:12:43 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-19 11:12:43 +0000 |
| commit | 0f5b1a3ecae01bd64378b898246e006e22c9b539 (patch) | |
| tree | fff9b91aaed0bc78fb8082de5b431cb9bc977cd5 /target/linux/generic/patches-4.0 | |
| parent | 631e98977b4a4dadde7671f3a35bf3f3a10d11dc (diff) | |
| download | upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.gz upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.bz2 upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.zip | |
kernel: update 4.0 to 4.0.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46063
Diffstat (limited to 'target/linux/generic/patches-4.0')
4 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch index 07562b28fc..433d77b6c1 100644 --- a/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch +++ b/target/linux/generic/patches-4.0/491-ubi-auto-create-ubiblock-device-for-rootfs.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c -@@ -614,6 +614,44 @@ static void __init ubiblock_create_from_ +@@ -616,6 +616,44 @@ static void __init ubiblock_create_from_ } } @@ -56,7 +56,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> static void ubiblock_remove_all(void) { struct ubiblock *next; -@@ -644,6 +682,10 @@ int __init ubiblock_init(void) +@@ -646,6 +684,10 @@ int __init ubiblock_init(void) */ ubiblock_create_from_param(); diff --git a/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch index f080fd1532..18737524e8 100644 --- a/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch +++ b/target/linux/generic/patches-4.0/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch @@ -19,7 +19,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> #include "ubi-media.h" #include "ubi.h" -@@ -437,6 +438,15 @@ int ubiblock_create(struct ubi_volume_in +@@ -439,6 +440,15 @@ int ubiblock_create(struct ubi_volume_in add_disk(dev->gd); dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)", dev->ubi_num, dev->vol_id, vi->name); diff --git a/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch b/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch index 28b8bcfbcb..621d08f4f1 100644 --- a/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch +++ b/target/linux/generic/patches-4.0/785-hso-support-0af0-9300.patch @@ -10,7 +10,7 @@ {USB_DEVICE(0x0af0, 0xd155)}, --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h -@@ -1323,6 +1323,12 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0 +@@ -1330,6 +1330,12 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 0 ), diff --git a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch b/target/linux/generic/patches-4.0/834-ledtrig-libata.patch index a3a606275e..dcb80c8685 100644 --- a/target/linux/generic/patches-4.0/834-ledtrig-libata.patch +++ b/target/linux/generic/patches-4.0/834-ledtrig-libata.patch @@ -138,7 +138,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -865,6 +868,12 @@ struct ata_port { +@@ -874,6 +877,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif |