tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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"

Linus Torvalds 865752ed 97f084b8

+2 -2
+1 -1
drivers/staging/comedi/drivers/s626.c
··· 1483 1483 case TRIG_NONE: 1484 1484 /* continous acquisition */ 1485 1485 devpriv->ai_continous = 1; 1486 - devpriv->ai_sample_count = 0; 1486 + devpriv->ai_sample_count = 1; 1487 1487 break; 1488 1488 } 1489 1489
+1 -1
drivers/staging/zcache/Kconfig
··· 15 15 depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y 16 16 depends on NET 17 17 # must ensure struct page is 8-byte aligned 18 - select HAVE_ALIGNED_STRUCT_PAGE if !64_BIT 18 + select HAVE_ALIGNED_STRUCT_PAGE if !64BIT 19 19 default n 20 20 help 21 21 RAMster allows RAM on other machines in a cluster to be utilized