projects
/
comedi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8dae093
)
diable isapnp, because it doesn't compile on 2.6
author
David Schleef
<ds@schleef.org>
Thu, 7 Aug 2003 01:04:14 +0000
(
01:04
+0000)
committer
David Schleef
<ds@schleef.org>
Thu, 7 Aug 2003 01:04:14 +0000
(
01:04
+0000)
comedi/drivers/ni_atmio.c
patch
|
blob
|
history
diff --git
a/comedi/drivers/ni_atmio.c
b/comedi/drivers/ni_atmio.c
index 5e472e238d433b379a4634d5f7bec509f12fb75c..9773bb4e8c231b0b3a1d62fc68db8842d398224d 100644
(file)
--- a/
comedi/drivers/ni_atmio.c
+++ b/
comedi/drivers/ni_atmio.c
@@
-316,6
+316,7
@@
static inline unsigned short __win_in(comedi_device *dev, int addr)
+#undef __ISAPNP__
#ifdef __ISAPNP__
static struct isapnp_device_id device_ids[] = {
{ ISAPNP_DEVICE_SINGLE('N','I','C',0x1900,'N','I','C',0x0000), },