3.4-stable patches

added patches:
	staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch

diff --git a/queue-3.4/series b/queue-3.4/series
index 11d2f33175ce7b4f88a41ae77b22b7748b4f82a5..ce7dbb067d3a18c9451d8f1845069cc65ebeffda 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -166,3 +166,4 @@ ceph-don-t-add-dirty-inode-to-dirty-list-if-caps-is-in-migration.patch
 ceph-fix-__ceph_do_pending_vmtruncate.patch
 ceph-call-handle_cap_grant-for-cap-import-message.patch
 libceph-unlock-unprocessed-pages-in-start_read-error-path.patch
+staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch

diff --git a/queue-3.4/staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch b/queue-3.4/staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch
new file mode 100644 (file)
index 0000000..578605d
--- /dev/null
+++ b/queue-3.4/staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch
@@ -0,0 +1,30 @@
+From 34ffb33e09132401872fe79e95c30824ce194d23 Mon Sep 17 00:00:00 2001
+From: Ian Abbott <abbotti@mev.co.uk>
+Date: Thu, 3 Jan 2013 12:15:26 +0000
+Subject: staging: comedi: Kconfig: COMEDI_NI_AT_A2150 should select COMEDI_FC
+
+From: Ian Abbott <abbotti@mev.co.uk>
+
+commit 34ffb33e09132401872fe79e95c30824ce194d23 upstream.
+
+The 'ni_at_a2150' module links to `cfc_write_to_buffer` in the
+'comedi_fc' module, so selecting 'COMEDI_NI_AT_A2150' in the kernel config
+needs to also select 'COMEDI_FC'.
+
+Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/comedi/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/comedi/Kconfig
++++ b/drivers/staging/comedi/Kconfig
+@@ -424,6 +424,7 @@ config COMEDI_ADQ12B
+ 
+ config COMEDI_NI_AT_A2150
+       tristate "NI AT-A2150 ISA card support"
++      select COMEDI_FC
+       depends on COMEDI_NI_COMMON
+       depends on VIRT_TO_BUS
+       default N