diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-01 11:08:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-01 11:08:50 -0800 |
| commit | 225c5935d397e192f4d7b04a8eeab95a56ea64b4 (patch) | |
| tree | 2bd3f302c3589ab98b3812aa475623f44c482c16 | |
| parent | 8cc41761de7769edb4a2db3a5623a61f4126cf40 (diff) | |
| download | patches-225c5935d397e192f4d7b04a8eeab95a56ea64b4.tar.gz | |
2.6.33-rc6
| -rw-r--r-- | driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch | 4 | ||||
| -rw-r--r-- | staging/staging-add-broadcom-crystal-hd-driver.patch | 11 | ||||
| -rw-r--r-- | staging/staging-dt3155-add-it-to-the-build.patch | 2 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch b/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch index 27546a008d008f..1755753d092e61 100644 --- a/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch +++ b/driver-core/sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch @@ -412,7 +412,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int err; --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -9202,11 +9202,13 @@ static ssize_t sched_power_savings_store +@@ -9217,11 +9217,13 @@ static ssize_t sched_power_savings_store #ifdef CONFIG_SCHED_MC static ssize_t sched_mc_power_savings_show(struct sysdev_class *class, @@ -426,7 +426,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> const char *buf, size_t count) { return sched_power_savings_store(buf, count, 0); -@@ -9218,11 +9220,13 @@ static SYSDEV_CLASS_ATTR(sched_mc_power_ +@@ -9233,11 +9235,13 @@ static SYSDEV_CLASS_ATTR(sched_mc_power_ #ifdef CONFIG_SCHED_SMT static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev, diff --git a/staging/staging-add-broadcom-crystal-hd-driver.patch b/staging/staging-add-broadcom-crystal-hd-driver.patch index 9228fc1902bea0..45b4a3c1d5296c 100644 --- a/staging/staging-add-broadcom-crystal-hd-driver.patch +++ b/staging/staging-add-broadcom-crystal-hd-driver.patch @@ -132,6 +132,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/staging/crystalhd/bc_dts_glob_lnx.h | 299 drivers/staging/crystalhd/bc_dts_types.h | 115 drivers/staging/crystalhd/bcm_70012_regs.h |12299 ++++++++++++++++++++++++++++ + drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/crystalhd/Kconfig | 6 + drivers/staging/crystalhd/Makefile | 6 + drivers/staging/crystalhd/TODO | 16 + drivers/staging/crystalhd/bc_dts_defs.h | 498 + + drivers/staging/crystalhd/bc_dts_glob_lnx.h | 299 + drivers/staging/crystalhd/bc_dts_types.h | 115 + drivers/staging/crystalhd/bcm_70012_regs.h |12299 ++++++++++++++++++++++++++++ drivers/staging/crystalhd/crystalhd_cmds.c | 1058 ++ drivers/staging/crystalhd/crystalhd_cmds.h | 88 drivers/staging/crystalhd/crystalhd_fw_if.h | 369 @@ -19873,7 +19882,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -141,5 +141,7 @@ source "drivers/staging/sm7xx/Kconfig" +@@ -139,5 +139,7 @@ source "drivers/staging/sm7xx/Kconfig" source "drivers/staging/dt3155/Kconfig" diff --git a/staging/staging-dt3155-add-it-to-the-build.patch b/staging/staging-dt3155-add-it-to-the-build.patch index 88bc90757ea2b9..f4f3f2033ec4bd 100644 --- a/staging/staging-dt3155-add-it-to-the-build.patch +++ b/staging/staging-dt3155-add-it-to-the-build.patch @@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + allocator.o --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -145,5 +145,7 @@ source "drivers/staging/netwave/Kconfig" +@@ -143,5 +143,7 @@ source "drivers/staging/netwave/Kconfig" source "drivers/staging/sm7xx/Kconfig" @@ -1 +1 @@ -2.6.33-rc5 +2.6.33-rc6 |