tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds f5d9d249 db08bf08

+5 -2
unified split
+3 -1
drivers/pcmcia/pcmcia_resource.c
··· 514 } 515 516 /* Pick memory or I/O card, DMA mode, interrupt */ 517 - if (p_dev->_io) 518 s->socket.flags |= SS_IOCARD; 519 if (flags & CONF_ENABLE_SPKR) { 520 s->socket.flags |= SS_SPKR_ENA;
··· 514 } 515 516 /* Pick memory or I/O card, DMA mode, interrupt */ 517 + if (p_dev->_io || flags & CONF_ENABLE_IRQ) 518 + flags |= CONF_ENABLE_IOCARD; 519 + if (flags & CONF_ENABLE_IOCARD) 520 s->socket.flags |= SS_IOCARD; 521 if (flags & CONF_ENABLE_SPKR) { 522 s->socket.flags |= SS_SPKR_ENA;
-1
drivers/staging/comedi/drivers/ni_daq_700.c
··· 496 497 static void dio700_config(struct pcmcia_device *link) 498 { 499 - win_req_t req; 500 int ret; 501 502 printk(KERN_INFO "ni_daq_700: cs-config\n");
··· 496 497 static void dio700_config(struct pcmcia_device *link) 498 { 499 int ret; 500 501 printk(KERN_INFO "ni_daq_700: cs-config\n");
+2
include/pcmcia/ds.h
··· 259 #define CONF_ENABLE_SPKR 0x0002 260 #define CONF_ENABLE_PULSE_IRQ 0x0004 261 #define CONF_ENABLE_ESR 0x0008 262 263 /* flags used by pcmcia_loop_config() autoconfiguration */ 264 #define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */
··· 259 #define CONF_ENABLE_SPKR 0x0002 260 #define CONF_ENABLE_PULSE_IRQ 0x0004 261 #define CONF_ENABLE_ESR 0x0008 262 + #define CONF_ENABLE_IOCARD 0x0010 /* auto-enabled if IO resources or IRQ 263 + * (CONF_ENABLE_IRQ) in use */ 264 265 /* flags used by pcmcia_loop_config() autoconfiguration */ 266 #define CONF_AUTO_CHECK_VCC 0x0100 /* check for matching Vcc? */