summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Swetland <swetland@google.com>2010-09-24 16:29:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-24 16:29:03 -0700
commit96d4ccee4fd69a95d8a75c14df8f5baa6b31aa4d (patch)
tree8ff623605328d2d60d3d0b248f98bb29e568ed80
parentb02691ec77f60b9928948823fcb6432bbcde6722 (diff)
parent5bc526aa5e4e2171fc04e639981a81dcad409843 (diff)
downloaddevice_samsung_crespo-96d4ccee4fd69a95d8a75c14df8f5baa6b31aa4d.zip
device_samsung_crespo-96d4ccee4fd69a95d8a75c14df8f5baa6b31aa4d.tar.gz
device_samsung_crespo-96d4ccee4fd69a95d8a75c14df8f5baa6b31aa4d.tar.bz2
Merge "S5PC11X: SENSORS: Fix sensor string name" into gingerbread
-rw-r--r--libsensors/sensors.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp
index 03e857b..6f77007 100644
--- a/libsensors/sensors.cpp
+++ b/libsensors/sensors.cpp
@@ -67,8 +67,8 @@
/* The SENSORS Module */
static const struct sensor_t sSensorList[] = {
- { "AK8973 3-axis Accelerometer",
- "Asahi Kasei Microdevices",
+ { "KR3DM 3-axis Accelerometer",
+ "STMicroelectronics",
1, SENSORS_ACCELERATION_HANDLE,
SENSOR_TYPE_ACCELEROMETER, 4.0f, 1.0f/720.0f, 1.0f, 0, { } },
{ "AK8973 3-axis Magnetic field sensor",
@@ -88,7 +88,7 @@ static const struct sensor_t sSensorList[] = {
1, SENSORS_PROXIMITY_HANDLE,
SENSOR_TYPE_PROXIMITY, 1.0, 1, 20, 0, { } },
{ "K3G Gyroscope sensor",
- "ST Micro",
+ "STMicroelectronics",
1, SENSORS_GYROSCOPE_HANDLE,
SENSOR_TYPE_GYROSCOPE, 1.0, 1, 20, 0, { } },
};