refresh patches and fix build failure on wm8753-reg_cache.patch (#5641)
SVN-Revision: 17182
This commit is contained in:
parent
bb5a40c64b
commit
b8af58d3e7
4 changed files with 8 additions and 12 deletions
|
@ -355,8 +355,6 @@
|
|||
|
||||
/* LED registers */
|
||||
#define PCF50633_REG_LEDOUT 0x28
|
||||
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
|
||||
index 8e14900..4809789 100644
|
||||
--- a/drivers/regulator/pcf50633-regulator.c
|
||||
+++ b/drivers/regulator/pcf50633-regulator.c
|
||||
@@ -24,11 +24,12 @@
|
||||
|
@ -373,7 +371,7 @@ index 8e14900..4809789 100644
|
|||
.type = REGULATOR_VOLTAGE, \
|
||||
.owner = THIS_MODULE, \
|
||||
}
|
||||
@@ -193,6 +194,40 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)
|
||||
@@ -193,6 +194,40 @@ static int pcf50633_regulator_get_voltag
|
||||
return millivolts * 1000;
|
||||
}
|
||||
|
||||
|
@ -414,7 +412,7 @@ index 8e14900..4809789 100644
|
|||
static int pcf50633_regulator_enable(struct regulator_dev *rdev)
|
||||
{
|
||||
struct pcf50633 *pcf = rdev_get_drvdata(rdev);
|
||||
@@ -246,6 +281,7 @@ static int pcf50633_regulator_is_enabled(struct regulator_dev *rdev)
|
||||
@@ -246,6 +281,7 @@ static int pcf50633_regulator_is_enabled
|
||||
static struct regulator_ops pcf50633_regulator_ops = {
|
||||
.set_voltage = pcf50633_regulator_set_voltage,
|
||||
.get_voltage = pcf50633_regulator_get_voltage,
|
||||
|
@ -422,7 +420,7 @@ index 8e14900..4809789 100644
|
|||
.enable = pcf50633_regulator_enable,
|
||||
.disable = pcf50633_regulator_disable,
|
||||
.is_enabled = pcf50633_regulator_is_enabled,
|
||||
@@ -253,27 +289,27 @@ static struct regulator_ops pcf50633_regulator_ops = {
|
||||
@@ -253,27 +289,27 @@ static struct regulator_ops pcf50633_reg
|
||||
|
||||
static struct regulator_desc regulators[] = {
|
||||
[PCF50633_REGULATOR_AUTO] =
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
+ codec->reg_cache = wm8753->reg_cache;
|
||||
codec->private_data = wm8753;
|
||||
|
||||
- memcpy(codec->reg_cache, wm8753_reg, sizeof(codec->reg_cache));
|
||||
- memcpy(codec->reg_cache, wm8753_reg, sizeof(wm8753->reg_cache));
|
||||
+ memcpy(codec->reg_cache, wm8753_reg, sizeof(wm8753_reg));
|
||||
INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-core.h b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
|
||||
index 8fe1920..f8b879a 100644
|
||||
--- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h
|
||||
+++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
|
||||
@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
|
||||
@@ -28,7 +28,7 @@ static inline struct s3c_gpio_chip *s3c_
|
||||
return NULL;
|
||||
|
||||
chip = &s3c24xx_gpios[pin/32];
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- linux-2.6.30.1/init/main.c.orig 2009-07-07 19:35:25.000000000 +0200
|
||||
+++ linux-2.6.30.1/init/main.c 2009-07-07 19:35:39.000000000 +0200
|
||||
@@ -830,11 +830,11 @@
|
||||
--- a/init/main.c
|
||||
+++ b/init/main.c
|
||||
@@ -830,11 +830,11 @@ static noinline int init_post(void)
|
||||
* The Bourne shell can be used instead of init if we are
|
||||
* trying to recover a really broken machine.
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue