diff options
| -rw-r--r-- | arch/arm/configs/gta02-moredrivers-defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/gta02-packaging-defconfig | 2 | ||||
| -rw-r--r-- | drivers/regulator/pcf50633-regulator.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig index 378bc93064a..0d67185a2b3 100644 --- a/arch/arm/configs/gta02-moredrivers-defconfig +++ b/arch/arm/configs/gta02-moredrivers-defconfig @@ -954,7 +954,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers diff --git a/arch/arm/configs/gta02-packaging-defconfig b/arch/arm/configs/gta02-packaging-defconfig index 78d15368674..0f8ee7e2b60 100644 --- a/arch/arm/configs/gta02-packaging-defconfig +++ b/arch/arm/configs/gta02-packaging-defconfig @@ -958,7 +958,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_EVBUG=m +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index f8e1fafb03f..343f43e2392 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c @@ -189,7 +189,7 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev) return -EINVAL; } - return rc; + return rc * 1000; } static int pcf50633_regulator_enable(struct regulator_dev *rdev) |