Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755488Ab3EMXpe (ORCPT ); Mon, 13 May 2013 19:45:34 -0400 Received: from mail-da0-f51.google.com ([209.85.210.51]:44919 "EHLO mail-da0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754328Ab3EMXpd (ORCPT ); Mon, 13 May 2013 19:45:33 -0400 Date: Mon, 13 May 2013 14:28:37 -0700 From: Greg Kroah-Hartman To: Ian Abbott Cc: devel@linuxdriverproject.org, Frank Mori Hess , linux-kernel@vger.kernel.org, Geert Uytterhoeven , H Hartley Sweeten Subject: Re: [PATCH] staging: comedi: ni_labpc: fix VIRT_TO_BUS dependency Message-ID: <20130513212837.GB14092@kroah.com> References: <5190B62C.1070704@mev.co.uk> <1368442935-25926-1-git-send-email-abbotti@mev.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1368442935-25926-1-git-send-email-abbotti@mev.co.uk> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1818 Lines: 39 On Mon, May 13, 2013 at 12:02:15PM +0100, Ian Abbott wrote: > The "ni_labpc" module acts as a low-level comedi driver for various > Nattional Instruments Lab-PC ISA cards if `CONFIG_NI_LABPC_ISA` is > enabled, and also as a common module depended on by the "ni_labpc_cs" > and "ni_labpc_pci" modules. For ISA cards, it optionally supports the > use of an ISA DMA channel if `CONFIG_ISA_DMA_API` is enabled, using > conditionally compiled code. This conditionally compiled code also > relies on `virt_to_bus()`, which only exists if `CONFIG_VIRT_TO_BUS` is > enabled. Therefore, support for ISA DMA should only be compiled in if > both `CONFIG_ISA_DMA_API` and `CONFIG_VIRT_TO_BUS` are defined, > otherwise the "ni_labpc" module fails to compile on kernels that enable > `CONFIG_ISA_DMA_API` but not `CONFIG_VIRT_TO_BUS`. > > Conditionally define a new macro `NI_LABPC_ISA_DMA` iff both > `CONFIG_ISA_DMA_API` and `CONFIG_VIRT_TO_BUS` are defined, and change > the conditional compilation tests to use the new macro instead of > `CONFIG_ISA_DMA_API`. > > Also, in the "Kconfig", remove the `VIRT_TO_BUS` dependency from the > `COMEDI_NI_LABPC_ISA` option since the dependency is now checked at > compile time. > > Signed-off-by: Ian Abbott > --- > drivers/staging/comedi/Kconfig | 1 - > drivers/staging/comedi/drivers/ni_labpc.c | 18 +++++++++++------- > 2 files changed, 11 insertions(+), 8 deletions(-) Ick, no, I'll take Hartley's patch he sent a week or so ago that fixes this properly for all architectures. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/