From ec59c2cd066980ccd379c8a13b0fdd70aff3eb3d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 15 Jan 2013 10:15:30 -0800 Subject: [PATCH] 3.0-stable patches added patches: staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch --- queue-3.0/series | 1 + ..._ni_at_a2150-should-select-comedi_fc.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 queue-3.0/staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch diff --git a/queue-3.0/series b/queue-3.0/series index 0c4c22ac326..3aecc8c1014 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -67,3 +67,4 @@ gfs2-test-bufdata-with-buffer-locked-and-gfs2_log_lock-held.patch intel-iommu-free-old-page-tables-before-creating-superpage.patch kvm-ppc-44x-fix-dcr-read-write.patch revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch +staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch diff --git a/queue-3.0/staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch b/queue-3.0/staging-comedi-kconfig-comedi_ni_at_a2150-should-select-comedi_fc.patch new file mode 100644 index 00000000000..578605ddc75 --- /dev/null +++ b/queue-3.0/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 +Date: Thu, 3 Jan 2013 12:15:26 +0000 +Subject: staging: comedi: Kconfig: COMEDI_NI_AT_A2150 should select COMEDI_FC + +From: Ian Abbott + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 -- 2.47.3