[PATCH] staging: comedi: ii_pci20kc: add CONFIG_HAS_IOMEM dependence

David Cohen david.a.cohen at linux.intel.com
Wed Oct 15 22:06:54 UTC 2014


On Wed, Oct 15, 2014 at 10:57:00PM +0100, Ian Abbott wrote:
> On 15/10/14 22:25, David Cohen wrote:
> >ii_pci20kc uses io memory which makes it not compilable on architectures
> >without HAS_IOMEM such as UML:
> >
> >   CC      drivers/net/wireless/ti/wl1251/main.o
> >drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_attach’:
> >drivers/staging/comedi/drivers/ii_pci20kc.c:442:2: error: implicit
> >declaration of function ‘ioremap’
> >[-Werror=implicit-function-declaration]
> >   dev->mmio = ioremap(membase, II20K_SIZE);
> >   ^
> >drivers/staging/comedi/drivers/ii_pci20kc.c:442:12: warning: assignment
> >makes pointer from integer without a cast
> >   dev->mmio = ioremap(membase, II20K_SIZE);
> >             ^
> >drivers/staging/comedi/drivers/ii_pci20kc.c: In function ‘ii20k_detach’:
> >drivers/staging/comedi/drivers/ii_pci20kc.c:512:3: error: implicit
> >declaration of function ‘iounmap’
> >[-Werror=implicit-function-declaration]
> >    iounmap(dev->mmio);
> >    ^
> >
> >Signed-off-by: David Cohen <david.a.cohen at linux.intel.com>
> >---
> >  drivers/staging/comedi/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> >
> >diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> >index a8bc2b567789..56be2112c731 100644
> >--- a/drivers/staging/comedi/Kconfig
> >+++ b/drivers/staging/comedi/Kconfig
> >@@ -425,6 +425,7 @@ config COMEDI_AIO_IIRO_16
> >  	  called aio_iiro_16.
> >
> >  config COMEDI_II_PCI20KC
> >+	depends on HAS_IOMEM
> >  	tristate "Intelligent Instruments PCI-20001C carrier support"
> >  	---help---
> >  	  Enable support for Intelligent Instruments PCI-20001C carrier
> >
> 
> The same fix was already submitted by Chen Gang:
> 
> https://lkml.org/lkml/2014/10/2/318

Thanks. I sent this patch based on today's linux-next's "make ARCH=um
allyesconfig". But nevermind if it was already sent.

Br, David

> 
> Reviewed-by: Ian Abbott <abbotti at mev.co.uk>
> 
> -- 
> -=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti at mev.co.uk> )=-
> -=(                          Web: http://www.mev.co.uk/  )=-


More information about the devel mailing list