5 files changed, 15 insertions, 16 deletions

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index d0ae71ec2aa0..f98c493efff8 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -30,6 +30,20 @@ config AD7791
           To compile this driver as a module, choose M here: the module will be
           called ad7791.
 
+config AD7476
+        tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
+        depends on SPI
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
+        help
+          Say yes here to build support for Analog Devices
+          AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
+          SPI analog to digital converters (ADC).
+          If unsure, say N (but it's safe to say "Y").
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad7476.
+
 config AT91_ADC
         tristate "Atmel AT91 ADC"
         depends on ARCH_AT91
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index f187ff6c2a16..9824a70f4fd8 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -4,5 +4,6 @@
 
 obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o
 obj-$(CONFIG_AD7266) += ad7266.o
+obj-$(CONFIG_AD7476) += ad7476.o
 obj-$(CONFIG_AD7791) += ad7791.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
diff --git a/drivers/staging/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c
index a33a4066ebe2..a33a4066ebe2 100644
--- a/drivers/staging/iio/adc/ad7476.c
+++ b/drivers/iio/adc/ad7476.c
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index a1fa1729acbe..1b4a356639a5 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -68,20 +68,6 @@ config AD799X_RING_BUFFER
           Say yes here to include ring buffer support in the AD799X
           ADC driver.
 
-config AD7476
-        tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
-        depends on SPI
-        select IIO_BUFFER
-        select IIO_TRIGGERED_BUFFER
-        help
-          Say yes here to build support for Analog Devices
-          AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
-          SPI analog to digital converters (ADC).
-          If unsure, say N (but it's safe to say "Y").
-
-          To compile this driver as a module, choose M here: the
-          module will be called ad7476.
-
 config AD7887
         tristate "Analog Devices AD7887 ADC driver"
         depends on SPI
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 6b60af038616..62ee02e80cf9 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -17,8 +17,6 @@ ad799x-y := ad799x_core.o
 ad799x-$(CONFIG_AD799X_RING_BUFFER) += ad799x_ring.o
 obj-$(CONFIG_AD799X) += ad799x.o
 
-obj-$(CONFIG_AD7476) += ad7476.o
-
 ad7887-y := ad7887_core.o
 ad7887-$(CONFIG_IIO_BUFFER) += ad7887_ring.o
 obj-$(CONFIG_AD7887) += ad7887.o