diff options
| -rw-r--r-- | arch/arm/configs/cyanogenmod_n5100_defconfig | 4 | ||||
| -rw-r--r-- | include/linux/sensor/gp2a.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/configs/cyanogenmod_n5100_defconfig b/arch/arm/configs/cyanogenmod_n5100_defconfig index 191702f..7e90e7d 100644 --- a/arch/arm/configs/cyanogenmod_n5100_defconfig +++ b/arch/arm/configs/cyanogenmod_n5100_defconfig @@ -2915,11 +2915,11 @@ CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=2 CONFIG_SENSORS_YAS532=y CONFIG_SENSORS_YAS_ORI=y # CONFIG_SENSORS_TAOS is not set -# CONFIG_SENSORS_GP2A is not set +CONFIG_SENSORS_GP2A=y # CONFIG_SENSORS_GP2A_ANALOG is not set # CONFIG_SENSORS_CM36651 is not set # CONFIG_SENSORS_BH1721 is not set -CONFIG_SENSORS_AL3201=y +# CONFIG_SENSORS_AL3201 is not set CONFIG_SENSORS_K2DH=y CONFIG_SENSORS_K3DH=y CONFIG_SENSOR_K3DH_INPUTDEV=y diff --git a/include/linux/sensor/gp2a.h b/include/linux/sensor/gp2a.h index 08ec548..1c9618a 100644 --- a/include/linux/sensor/gp2a.h +++ b/include/linux/sensor/gp2a.h @@ -63,18 +63,12 @@ extern char proximity_sensor_detection; /* prototype */ int opt_i2c_read(u8 reg, unsigned char *rbuf, int len); int opt_i2c_write(u8 reg, u8 *val); -#ifndef CONFIG_MACH_KONA_SENSOR int lightsensor_get_adcvalue(void); -#endif int is_gp2a030a(void); struct gp2a_platform_data { int (*gp2a_led_on) (bool); int p_out; /* proximity-sensor-output gpio */ -#ifdef CONFIG_MACH_KONA_SENSOR - unsigned long (*gp2a_get_threshold)(u8 *); -#else unsigned long (*gp2a_get_threshold)(void); -#endif }; #endif |