summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iio/magnetometer/Kconfig11
-rw-r--r--drivers/iio/magnetometer/Makefile1
-rw-r--r--drivers/iio/magnetometer/ak8975.c (renamed from drivers/staging/iio/magnetometer/ak8975.c)0
-rw-r--r--drivers/staging/iio/magnetometer/Kconfig11
-rw-r--r--drivers/staging/iio/magnetometer/Makefile1
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
index cd29be54f643..bd1cfb666695 100644
--- a/drivers/iio/magnetometer/Kconfig
+++ b/drivers/iio/magnetometer/Kconfig
@@ -3,6 +3,17 @@
3# 3#
4menu "Magnetometer sensors" 4menu "Magnetometer sensors"
5 5
6config AK8975
7 tristate "Asahi Kasei AK8975 3-Axis Magnetometer"
8 depends on I2C
9 depends on GPIOLIB
10 help
11 Say yes here to build support for Asahi Kasei AK8975 3-Axis
12 Magnetometer.
13
14 To compile this driver as a module, choose M here: the module
15 will be called ak8975.
16
6config HID_SENSOR_MAGNETOMETER_3D 17config HID_SENSOR_MAGNETOMETER_3D
7 depends on HID_SENSOR_HUB 18 depends on HID_SENSOR_HUB
8 select IIO_BUFFER 19 select IIO_BUFFER
diff --git a/drivers/iio/magnetometer/Makefile b/drivers/iio/magnetometer/Makefile
index e78672876dc2..7f328e37fbab 100644
--- a/drivers/iio/magnetometer/Makefile
+++ b/drivers/iio/magnetometer/Makefile
@@ -2,6 +2,7 @@
2# Makefile for industrial I/O Magnetometer sensor drivers 2# Makefile for industrial I/O Magnetometer sensor drivers
3# 3#
4 4
5obj-$(CONFIG_AK8975) += ak8975.o
5obj-$(CONFIG_HID_SENSOR_MAGNETOMETER_3D) += hid-sensor-magn-3d.o 6obj-$(CONFIG_HID_SENSOR_MAGNETOMETER_3D) += hid-sensor-magn-3d.o
6 7
7obj-$(CONFIG_IIO_ST_MAGN_3AXIS) += st_magn.o 8obj-$(CONFIG_IIO_ST_MAGN_3AXIS) += st_magn.o
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index af6c320a534e..af6c320a534e 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
diff --git a/drivers/staging/iio/magnetometer/Kconfig b/drivers/staging/iio/magnetometer/Kconfig
index df5e0d4ea295..a3ea69e9d800 100644
--- a/drivers/staging/iio/magnetometer/Kconfig
+++ b/drivers/staging/iio/magnetometer/Kconfig
@@ -3,17 +3,6 @@
3# 3#
4menu "Magnetometer sensors" 4menu "Magnetometer sensors"
5 5
6config SENSORS_AK8975
7 tristate "Asahi Kasei AK8975 3-Axis Magnetometer"
8 depends on I2C
9 depends on GPIOLIB
10 help
11 Say yes here to build support for Asahi Kasei AK8975 3-Axis
12 Magnetometer.
13
14 To compile this driver as a module, choose M here: the module
15 will be called ak8975.
16
17config SENSORS_HMC5843 6config SENSORS_HMC5843
18 tristate "Honeywell HMC5843/5883/5883L 3-Axis Magnetometer" 7 tristate "Honeywell HMC5843/5883/5883L 3-Axis Magnetometer"
19 depends on I2C 8 depends on I2C
diff --git a/drivers/staging/iio/magnetometer/Makefile b/drivers/staging/iio/magnetometer/Makefile
index f2a753f80796..f9bfb2e11d7d 100644
--- a/drivers/staging/iio/magnetometer/Makefile
+++ b/drivers/staging/iio/magnetometer/Makefile
@@ -2,5 +2,4 @@
2# Makefile for industrial I/O Magnetometer sensors 2# Makefile for industrial I/O Magnetometer sensors
3# 3#
4 4
5obj-$(CONFIG_SENSORS_AK8975) += ak8975.o
6obj-$(CONFIG_SENSORS_HMC5843) += hmc5843.o 5obj-$(CONFIG_SENSORS_HMC5843) += hmc5843.o