Commit f5d9d249 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: fix ni_daq_700 compilation
  pcmcia: IOCARD is also required for using IRQs
parents db08bf08 36845d09

drivers/pcmcia/pcmcia_resource.c

+3 −1
Original line number Diff line number Diff line
@@ -514,7 +514,9 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev) 
	}



	/* Pick memory or I/O card, DMA mode, interrupt */

	if (p_dev->_io)

	if (p_dev->_io || flags & CONF_ENABLE_IRQ)

		flags |= CONF_ENABLE_IOCARD;

	if (flags & CONF_ENABLE_IOCARD)

		s->socket.flags |= SS_IOCARD;

	if (flags & CONF_ENABLE_SPKR) {

		s->socket.flags |= SS_SPKR_ENA;

drivers/staging/comedi/drivers/ni_daq_700.c

+0 −1
Original line number Diff line number Diff line
@@ -496,7 +496,6 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev, 


static void dio700_config(struct pcmcia_device *link)

{

	win_req_t req;

	int ret;



	printk(KERN_INFO "ni_daq_700:  cs-config\n");

include/pcmcia/ds.h

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev); 
#define CONF_ENABLE_SPKR        0x0002

#define CONF_ENABLE_PULSE_IRQ   0x0004

#define CONF_ENABLE_ESR         0x0008

#define CONF_ENABLE_IOCARD	0x0010 /* auto-enabled if IO resources or IRQ

					* (CONF_ENABLE_IRQ) in use */



/* flags used by pcmcia_loop_config() autoconfiguration */

#define CONF_AUTO_CHECK_VCC	0x0100 /* check for matching Vcc? */