staging:iio:ad799x: Move ring functions to the main file
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 3 Oct 2014 09:31:00 +0000 (10:31 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sun, 16 Mar 2014 18:00:33 +0000 (18:00 +0000)
The ad799x_ring.c file is pretty much only one function these days. No need to
keep it in a separate file. Since there is then only one user of the header left
also move everything from the header to the main file.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/staging/iio/adc/Kconfig
drivers/staging/iio/adc/Makefile
drivers/staging/iio/adc/ad799x.h [deleted file]
drivers/staging/iio/adc/ad799x_core.c
drivers/staging/iio/adc/ad799x_ring.c [deleted file]

Simple merge
Simple merge
diff --cc drivers/staging/iio/adc/ad799x.h
Simple merge
Simple merge
diff --cc drivers/staging/iio/adc/ad799x_ring.c
Simple merge