diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:57:27 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:02:14 +0200 |
commit | 71f6424023cb9fa381efc7237ca05926b2b1ca9a (patch) | |
tree | 6c3c4a2110d0ff3d73c4bacaddb23b9295663695 /drivers/staging | |
parent | 9bc128e16bb82c046d6972171de572affc5c4cbf (diff) | |
parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
download | linux-71f6424023cb9fa381efc7237ca05926b2b1ca9a.tar.gz linux-71f6424023cb9fa381efc7237ca05926b2b1ca9a.tar.bz2 linux-71f6424023cb9fa381efc7237ca05926b2b1ca9a.zip |
Merge branch 'mxs/cleanup' into next/multiplatform
This is a dependency for mxs/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
drivers/clocksource/Makefile
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/mxs-lradc.c | 3 | ||||
-rw-r--r-- | drivers/staging/zcache/Kconfig | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 81a1fe661579..71a73ec5af8d 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -1483,7 +1483,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) case TRIG_NONE: /* continous acquisition */ devpriv->ai_continous = 1; - devpriv->ai_sample_count = 0; + devpriv->ai_sample_count = 1; break; } diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index 55a459b61907..0eb5b4d759e5 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c @@ -36,9 +36,6 @@ #include <linux/delay.h> #include <linux/input.h> -#include <mach/mxs.h> -#include <mach/common.h> - #include <linux/iio/iio.h> #include <linux/iio/buffer.h> #include <linux/iio/trigger.h> diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig index 73582705e8c5..5c3714530961 100644 --- a/drivers/staging/zcache/Kconfig +++ b/drivers/staging/zcache/Kconfig @@ -15,7 +15,7 @@ config RAMSTER depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y depends on NET # must ensure struct page is 8-byte aligned - select HAVE_ALIGNED_STRUCT_PAGE if !64_BIT + select HAVE_ALIGNED_STRUCT_PAGE if !64BIT default n help RAMster allows RAM on other machines in a cluster to be utilized |