diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-05 07:57:19 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-05 07:57:19 +0200 |
| commit | e6c340171f0daaccc95b90abbeed2b837157ee11 (patch) | |
| tree | 843d4035be59bd791321910e52157ce527b3b4b3 /drivers/iio/dac/ad5764.c | |
| parent | Input: tegra - move platform data header (diff) | |
| parent | Linux 3.6-rc4 (diff) | |
| download | linux-e6c340171f0daaccc95b90abbeed2b837157ee11.tar.xz linux-e6c340171f0daaccc95b90abbeed2b837157ee11.zip | |
Merge tag 'v3.6-rc4' into next
Linux 3.6-rc4
# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"
Diffstat (limited to '')
| -rw-r--r-- | drivers/iio/dac/ad5764.c (renamed from drivers/staging/iio/dac/ad5764.c) | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c index 03dbd937b081..ffce30447445 100644 --- a/drivers/staging/iio/dac/ad5764.c +++ b/drivers/iio/dac/ad5764.c @@ -18,7 +18,6 @@ #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include "dac.h" #define AD5764_REG_SF_NOP 0x0 #define AD5764_REG_SF_CONFIG 0x1 |