Staging driver fixes for 3.9-rc4
Here are two tiny staging driver fixes to resolve issues that have been reported. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlFUdV8ACgkQMUfUDdst+ylT7wCg06/tBMtv81D43yyiBBMKo3qy 86gAoNBbunIiInbIOELTxOOdrwZzpANj =AVoV -----END PGP SIGNATURE----- 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"
This commit is contained in:
commit
865752ed0a
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue