---

yaml --- r: 268729 b: refs/heads/master c: 48a2c37 h: refs/heads/master i: 268727: 0369800 v: v3
git-mirror · Oct 5, 2011 · 784930b · 784930b
1 parent 32db411
commit 784930b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 290 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5df06b16d50af7cc98ddf65ad6602ab07b62925a
+refs/heads/master: 48a2c3799b7141c271a771d3249142a104faeefc
diff --git a/trunk/drivers/staging/iio/adc/Kconfig b/trunk/drivers/staging/iio/adc/Kconfig
@@ -34,13 +34,6 @@ config AD7298
 	  To compile this driver as a module, choose M here: the
 	  module will be called ad7298.
 
-config AD7314
-	tristate "Analog Devices AD7314 temperature sensor driver"
-	depends on SPI
-	help
-	  Say yes here to build support for Analog Devices AD7314
-	  temperature sensors.
-
 config AD7606
 	tristate "Analog Devices AD7606 ADC driver"
 	depends on GPIOLIB

diff --git a/trunk/drivers/staging/iio/adc/Makefile b/trunk/drivers/staging/iio/adc/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_AD7298) += ad7298.o
 obj-$(CONFIG_AD7150) += ad7150.o
 obj-$(CONFIG_AD7152) += ad7152.o
 obj-$(CONFIG_AD7291) += ad7291.o
-obj-$(CONFIG_AD7314) += ad7314.o
 obj-$(CONFIG_AD7746) += ad7746.o
 obj-$(CONFIG_AD7780) += ad7780.o
 obj-$(CONFIG_AD7793) += ad7793.o

diff --git a/trunk/drivers/staging/iio/adc/ad7314.c b/trunk/drivers/staging/iio/adc/ad7314.c