diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | 88107f6e121a3a1835aa261a39a0a284e06457ce (patch) | |
| tree | b8f7a1618c29215aa3bfa0c24fe99bdffb4da650 /drivers/mfd | |
| parent | ae982001331215adb009cc93701401623b2a94d7 (diff) | |
| parent | 0d98114eb218aa80379b82192499e4c91d64123c (diff) | |
| download | barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.gz barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.xz | |
Merge branch 'for-next/randconfig'
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/mfd/mc34704.c | 4 | ||||
| -rw-r--r-- | drivers/mfd/mc9sdz60.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 57f40031bd..af67935092 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -25,7 +25,6 @@ config I2C_TWLCORE config I2C_TWL4030 depends on I2C - depends on USB_TWL4030 select I2C_TWLCORE bool "TWL4030 driver" diff --git a/drivers/mfd/mc34704.c b/drivers/mfd/mc34704.c index 20c01e2be6..0432a98f57 100644 --- a/drivers/mfd/mc34704.c +++ b/drivers/mfd/mc34704.c @@ -52,7 +52,7 @@ int mc34704_reg_read(struct mc34704 *mc34704, u8 reg, u8 *val) return ret == 1 ? 0 : ret; } -EXPORT_SYMBOL(mc34704_reg_read) +EXPORT_SYMBOL(mc34704_reg_read); int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val) { @@ -62,7 +62,7 @@ int mc34704_reg_write(struct mc34704 *mc34704, u8 reg, u8 val) return ret == 1 ? 0 : ret; } -EXPORT_SYMBOL(mc34704_reg_write) +EXPORT_SYMBOL(mc34704_reg_write); static ssize_t mc34704_read(struct cdev *cdev, void *_buf, size_t count, loff_t offset, ulong flags) diff --git a/drivers/mfd/mc9sdz60.c b/drivers/mfd/mc9sdz60.c index 0cd5007e1c..75d0789435 100644 --- a/drivers/mfd/mc9sdz60.c +++ b/drivers/mfd/mc9sdz60.c @@ -51,7 +51,7 @@ int mc9sdz60_reg_read(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 *val) return ret == 1 ? 0 : ret; } -EXPORT_SYMBOL(mc9sdz60_reg_read) +EXPORT_SYMBOL(mc9sdz60_reg_read); int mc9sdz60_reg_write(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 val) { @@ -61,7 +61,7 @@ int mc9sdz60_reg_write(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 val) return ret == 1 ? 0 : ret; } -EXPORT_SYMBOL(mc9sdz60_reg_write) +EXPORT_SYMBOL(mc9sdz60_reg_write); int mc9sdz60_set_bits(struct mc9sdz60 *mc9sdz60, enum mc9sdz60_reg reg, u8 mask, u8 val) { |