5 files changed, 19 insertions, 20 deletions

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 706386ba02e3..ef5200a6850e 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -73,4 +73,22 @@ config LP8788_ADC
         help
           Say yes here to build support for TI LP8788 ADC.
 
+config MAX1363
+        tristate "Maxim max1363 ADC driver"
+        depends on I2C
+        select IIO_TRIGGER
+        select MAX1363_RING_BUFFER
+        select IIO_BUFFER
+        select IIO_KFIFO_BUF
+        help
+          Say yes here to build support for many Maxim i2c analog to digital
+          converters (ADC). (max1361, max1362, max1363, max1364, max1036,
+          max1037, max1038, max1039, max1136, max1136, max1137, max1138,
+          max1139, max1236, max1237, max11238, max1239, max11600, max11601,
+          max11602, max11603, max11604, max11605, max11606, max11607,
+          max11608, max11609, max11610, max11611, max11612, max11613,
+          max11614, max11615, max11616, max11617, max11644, max11645,
+          max11646, max11647) Provides direct access via sysfs and buffered
+          data via the iio dev interface.
+
 endmenu
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 034eacb8f7c9..54ac7bbcd01b 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_AD7791) += ad7791.o
 obj-$(CONFIG_AD7887) += ad7887.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
+obj-$(CONFIG_MAX1363) += max1363.o
diff --git a/drivers/staging/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 1e84b5b55093..1e84b5b55093 100644
--- a/drivers/staging/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 4d348048b39d..0177f1e02300 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -130,24 +130,6 @@ config AD7280
           To compile this driver as a module, choose M here: the
           module will be called ad7280a
 
-config MAX1363
-        tristate "Maxim max1363 ADC driver"
-        depends on I2C
-        select IIO_TRIGGER
-        select MAX1363_RING_BUFFER
-        select IIO_BUFFER
-        select IIO_KFIFO_BUF
-        help
-          Say yes here to build support for many Maxim i2c analog to digital
-          converters (ADC). (max1361, max1362, max1363, max1364, max1036,
-          max1037, max1038, max1039, max1136, max1136, max1137, max1138,
-          max1139, max1236, max1237, max11238, max1239, max11600, max11601,
-          max11602, max11603, max11604, max11605, max11606, max11607,
-          max11608, max11609, max11610, max11611, max11612, max11613,
-          max11614, max11615, max11616, max11617, max11644, max11645,
-          max11646, max11647) Provides direct access via sysfs and buffered
-          data via the iio dev interface.
-
 config LPC32XX_ADC
         tristate "NXP LPC32XX ADC"
         depends on ARCH_LPC32XX
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 33979e62871b..12b4bd32437f 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -2,8 +2,6 @@
 # Makefile for industrial I/O ADC drivers
 #
 
-obj-$(CONFIG_MAX1363) += max1363.o
-
 ad7606-y := ad7606_core.o
 ad7606-$(CONFIG_IIO_BUFFER) += ad7606_ring.o
 ad7606-$(CONFIG_AD7606_IFACE_PARALLEL) += ad7606_par.o