Merge "input: sensors: rename the accelrometer sensors input device name"

#define ISR_INFO(dev, fmt, arg...)

#endif

#define SENSOR_NAME                 "accelerometer"

#define SENSOR_NAME                 "bma2x2-accel"

#define ABSMIN                      -512

#define ABSMAX                      512

#define SLOPE_THRESHOLD_VALUE       32

#define MPU6050_ACCEL_SCALE_SHIFT_2G	4

#define MPU6050_GYRO_SCALE_SHIFT_FS0	3

#define MPU6050_DEV_NAME_ACCEL	"accelerometer"

#define MPU6050_DEV_NAME_ACCEL	"MPU6050-accel"

#define MPU6050_DEV_NAME_GYRO	"gyroscope"

enum mpu6050_place {

#define LIS3DH_ACC_I2C_SAD_L	((LIS3DH_ACC_I2C_SADROOT<<1)|SAD0L)

#define LIS3DH_ACC_I2C_SAD_H	((LIS3DH_ACC_I2C_SADROOT<<1)|SAD0H)

#define	LIS3DH_ACC_DEV_NAME	"lis3dh_acc"

#define ACCEL_INPUT_DEV_NAME	"accelerometer"

#define ACCEL_INPUT_DEV_NAME	"lis3dh-accel"

/************************************************/

/*	Accelerometer defines section		*/