Commit 865752ed authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'staging-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg Kroah-Hartman:
 "Here are two tiny staging driver fixes to resolve issues that have
  been reported."

* tag 'staging-3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: comedi: s626: fix continuous acquisition
  staging: zcache: fix typo "64_BIT"
parents 97f084b8 e4317ce8
...@@ -1483,7 +1483,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -1483,7 +1483,7 @@ static int s626_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
case TRIG_NONE: case TRIG_NONE:
/* continous acquisition */ /* continous acquisition */
devpriv->ai_continous = 1; devpriv->ai_continous = 1;
devpriv->ai_sample_count = 0; devpriv->ai_sample_count = 1;
break; break;
} }
......
...@@ -15,7 +15,7 @@ config RAMSTER ...@@ -15,7 +15,7 @@ config RAMSTER
depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y
depends on NET depends on NET
# must ensure struct page is 8-byte aligned # 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 default n
help help
RAMster allows RAM on other machines in a cluster to be utilized RAMster allows RAM on other machines in a cluster to be utilized
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment