diff options
| -rw-r--r-- | csdio2.patch | 2 | ||||
| -rw-r--r-- | driver-core-remove-struct-bus_type.dev_attrs.patch | 19 | ||||
| -rw-r--r-- | p18.patch | 6 | ||||
| -rw-r--r-- | series | 46 | ||||
| -rw-r--r-- | staging-exfat-add-filesystem-to-the-build.patch | 10 |
5 files changed, 39 insertions, 44 deletions
diff --git a/csdio2.patch b/csdio2.patch index 8e3e75db3e6601..2db68bc027d093 100644 --- a/csdio2.patch +++ b/csdio2.patch @@ -1394,7 +1394,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +#endif --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild -@@ -91,6 +91,7 @@ header-y += coff.h +@@ -93,6 +93,7 @@ header-y += coff.h header-y += connector.h header-y += const.h header-y += cramfs_fs.h diff --git a/driver-core-remove-struct-bus_type.dev_attrs.patch b/driver-core-remove-struct-bus_type.dev_attrs.patch index d18ed3078848c5..99f2f87e3aa32f 100644 --- a/driver-core-remove-struct-bus_type.dev_attrs.patch +++ b/driver-core-remove-struct-bus_type.dev_attrs.patch @@ -10,9 +10,9 @@ it, can be removed. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- - drivers/base/bus.c | 39 ++------------------------------------- + drivers/base/bus.c | 37 +------------------------------------ include/linux/device.h | 2 -- - 2 files changed, 2 insertions(+), 39 deletions(-) + 2 files changed, 1 insertion(+), 38 deletions(-) --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /** * bus_add_device - add device to bus * @dev: device being added -@@ -510,16 +481,13 @@ int bus_add_device(struct device *dev) +@@ -510,12 +481,9 @@ int bus_add_device(struct device *dev) if (bus) { pr_debug("bus: '%s': add device %s\n", bus->name, dev_name(dev)); @@ -61,16 +61,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - goto out_put; error = device_add_groups(dev, bus->dev_groups); if (error) -- goto out_groups; +- goto out_id; + goto out_put; error = sysfs_create_link(&bus->p->devices_kset->kobj, &dev->kobj, dev_name(dev)); if (error) -- goto out_id; -+ goto out_groups; - error = sysfs_create_link(&dev->kobj, - &dev->bus->p->subsys.kobj, "subsystem"); - if (error) @@ -532,8 +500,6 @@ out_subsys: sysfs_remove_link(&bus->p->devices_kset->kobj, dev_name(dev)); out_groups: @@ -80,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> out_put: bus_put(dev->bus); return error; -@@ -593,7 +559,6 @@ void bus_remove_device(struct device *de +@@ -590,7 +556,6 @@ void bus_remove_device(struct device *de sysfs_remove_link(&dev->kobj, "subsystem"); sysfs_remove_link(&dev->bus->p->devices_kset->kobj, dev_name(dev)); @@ -90,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> klist_del(&dev->p->knode_bus); --- a/include/linux/device.h +++ b/include/linux/device.h -@@ -64,7 +64,6 @@ extern void bus_remove_file(struct bus_t +@@ -66,7 +66,6 @@ extern void bus_remove_file(struct bus_t * @name: The name of the bus. * @dev_name: Used for subsystems to enumerate devices like ("foo%u", dev->id). * @dev_root: Default device to use as the parent. @@ -98,7 +93,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> * @bus_groups: Default attributes of the bus. * @dev_groups: Default attributes of the devices on the bus. * @drv_groups: Default attributes of the device drivers on the bus. -@@ -105,7 +104,6 @@ struct bus_type { +@@ -110,7 +109,6 @@ struct bus_type { const char *name; const char *dev_name; struct device *dev_root; diff --git a/p18.patch b/p18.patch index 131a0ad359c701..3b438af2eb6208 100644 --- a/p18.patch +++ b/p18.patch @@ -7,7 +7,7 @@ --- a/arch/arm/mach-rpc/ecard.c +++ b/arch/arm/mach-rpc/ecard.c -@@ -761,19 +761,21 @@ static struct expansion_card *__init eca +@@ -760,19 +760,21 @@ static struct expansion_card *__init eca return ec; } @@ -32,7 +32,7 @@ { struct expansion_card *ec = ECARD_DEV(dev); char *str = buf; -@@ -787,35 +789,39 @@ static ssize_t ecard_show_resources(stru +@@ -786,35 +788,39 @@ static ssize_t ecard_show_resources(stru return str - buf; } @@ -84,7 +84,7 @@ int ecard_request_resources(struct expansion_card *ec) { -@@ -1120,7 +1126,7 @@ static int ecard_match(struct device *_d +@@ -1119,7 +1125,7 @@ static int ecard_match(struct device *_d struct bus_type ecard_bus_type = { .name = "ecard", @@ -2,7 +2,7 @@ usb-core-add-missing-license-information.patch ## broken patch! # -#csdio2.patch +csdio2.patch ##input-xpad-set-the-leds-properly-on-xbox-wireless-controllers.patch ##defer-input-nodes-and-led-support ##input-xpad-move-the-input-device-creation-to-a-new-function.patch @@ -12,13 +12,13 @@ usb-core-add-missing-license-information.patch ##input-xpad-properly-name-the-led-class-devices.patch # # -#staging-exfat-add-filesystem-to-drivers-staging-exfat.patch -#staging-exfat-add-filesystem-to-the-build.patch -#staging-exfat-include-aio.h.patch -#staging-exfat-hlist_for_each-api-change.patch -#staging-exfat-truncage_pagecache-api-change.patch -#staging-exfat-readdir-to-iterate-change.patch -#staging-exfat-kuid-fixes.patch +staging-exfat-add-filesystem-to-drivers-staging-exfat.patch +staging-exfat-add-filesystem-to-the-build.patch +staging-exfat-include-aio.h.patch +staging-exfat-hlist_for_each-api-change.patch +staging-exfat-truncage_pagecache-api-change.patch +staging-exfat-readdir-to-iterate-change.patch +staging-exfat-kuid-fixes.patch # # ## patches already in my git trees, but still here so I don't loose them. @@ -33,24 +33,24 @@ usb-core-add-missing-license-information.patch ## dev_groups to struct class work # # -#simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch +simulate-fake-fn-key-on-ps-2-keyboards-w-o-one-eg.-chromebook-pixel.patch # ##gregkh/gkh-version.patch # -#driver-core-remove-struct-bus_type.dev_attrs.patch -# -#p18.patch -#p19.patch -#p20.patch -#p21.patch -#p22.patch -#p23.patch -#p24.patch -#p25.patch -#p26.patch -#p27.patch -#p28.patch -#p29.patch +driver-core-remove-struct-bus_type.dev_attrs.patch +# +p18.patch +p19.patch +p20.patch +p21.patch +p22.patch +p23.patch +p24.patch +p25.patch +p26.patch +p27.patch +p28.patch +p29.patch # #qlcnic_sysfs.patch # diff --git a/staging-exfat-add-filesystem-to-the-build.patch b/staging-exfat-add-filesystem-to-the-build.patch index 941279698080cb..54646b28b582e5 100644 --- a/staging-exfat-add-filesystem-to-the-build.patch +++ b/staging-exfat-add-filesystem-to-the-build.patch @@ -18,19 +18,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -104,4 +104,6 @@ source "drivers/staging/i4l/Kconfig" +@@ -106,4 +106,6 @@ source "drivers/staging/greybus/Kconfig" - source "drivers/staging/ks7010/Kconfig" + source "drivers/staging/vc04_services/Kconfig" +source "drivers/staging/exfat/Kconfig" + endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -41,3 +41,4 @@ obj-$(CONFIG_WILC1000) += wilc1000/ - obj-$(CONFIG_MOST) += most/ - obj-$(CONFIG_ISDN_I4L) += i4l/ +@@ -42,3 +42,4 @@ obj-$(CONFIG_ISDN_I4L) += i4l/ obj-$(CONFIG_KS7010) += ks7010/ + obj-$(CONFIG_GREYBUS) += greybus/ + obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/ +obj-$(CONFIG_EXFAT_FS) += exfat/ --- /dev/null +++ b/drivers/staging/exfat/Kconfig |