diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
| commit | 0340ff10910d1daf161dc81ba6ffc85e47faa09b (patch) | |
| tree | 6dfac79e184d221cd925de4703d55d99bc3a8d6d /drivers/mfd/ab8500-sysctrl.c | |
| parent | 6484c6ca6b91d1e2b107d296e7306de3f6e422b2 (diff) | |
| parent | 74c41fb6f52268470b4552ca543515be210c71fb (diff) | |
Merge branch 'testing/defconfig-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into testing/multiplatformtracking-multiplatform-llct-20120821.0
Conflicts:
arch/arm/mach-pxa/cm-x2xx.c
sound/soc/ux500/ux500_msp_dai.c
sound/soc/ux500/ux500_msp_i2s.c
sound/soc/ux500/ux500_msp_i2s.h
Diffstat (limited to 'drivers/mfd/ab8500-sysctrl.c')
| -rw-r--r-- | drivers/mfd/ab8500-sysctrl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c index c28d4eb1eff0..736003afc8e6 100644 --- a/drivers/mfd/ab8500-sysctrl.c +++ b/drivers/mfd/ab8500-sysctrl.c @@ -33,6 +33,7 @@ int ab8500_sysctrl_read(u16 reg, u8 *value) return abx500_get_register_interruptible(sysctrl_dev, bank, (u8)(reg & 0xFF), value); } +EXPORT_SYMBOL_GPL(ab8500_sysctrl_read); int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value) { @@ -48,6 +49,7 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value) return abx500_mask_and_set_register_interruptible(sysctrl_dev, bank, (u8)(reg & 0xFF), mask, value); } +EXPORT_SYMBOL_GPL(ab8500_sysctrl_write); static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev) { |