diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-08 15:56:44 +0200 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-08 15:56:44 +0200 |
commit | f37686260161644129601ba19880abe48c56cc8d (patch) | |
tree | edb730a59ee660262fda345fa6fae65836449ba8 /drivers | |
parent | 3cbe7ec9b504c6cc0b5e47015db03dc56e9202c1 (diff) | |
parent | 0f4c06f76f1791075bbdd50822a3a5f410cf5077 (diff) |
Merge branch 'pcf50633-2.6.34' into om-gta02-2.6.34
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/pcf50633-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 5082c829444..aa906ff4eac 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c @@ -241,7 +241,7 @@ static const struct dev_pm_ops pcf50633_pm_ops = { #define PCF50633_PM_OPS (&pcf50633_pm_ops) #else -#define PC50633_PM_OPS NULL +#define PCF50633_PM_OPS NULL #endif #define PCF50633_CELL(_name) \ |