diff options
| author |   Samuel Ortiz <sameo@linux.intel.com> | 2012-07-31 00:36:16 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-31 00:51:09 +0200 |
| commit | 938e05bf131334804e08ec4fcd381edfd2d699f6 (patch) | |
| tree | db68f3da6be8d61ab657035c3901c65362b52c87 /include/linux/backing-dev.h | |
| parent | Merge tag 'for-linus-v3.6-rc1' of git://oss.sgi.com/xfs/xfs (diff) | |
| download | linux-dev-938e05bf131334804e08ec4fcd381edfd2d699f6.tar.xz linux-dev-938e05bf131334804e08ec4fcd381edfd2d699f6.zip | |
regulator: Fix an s5m8767 build failure
Due to a merge conflict we are getting this:
drivers/regulator/s5m8767.c: In function ‘s5m8767_pmic_probe’:
drivers/regulator/s5m8767.c:575:2: error: implicit declaration of function
‘s5m_reg_write’ [-Werror=implicit-function-declaration]
This is fixed by fully converting this driver to the new s5m API.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/backing-dev.h')
0 files changed, 0 insertions, 0 deletions