fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / pnp / quirks.c

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 74eecb2..e97ecef 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -11,18 +11,10 @@
  *  Copyright (c) 1999 Martin Mares <mj@ucw.cz>
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-
-#ifdef CONFIG_PNP_DEBUG
-       #define DEBUG
-#else
-       #undef DEBUG
-#endif
-
 #include <linux/pnp.h>
 #include "base.h"
 
@@ -63,14 +55,17 @@ static void quirk_awe32_resources(struct pnp_dev *dev)
 static void quirk_cmi8330_resources(struct pnp_dev *dev)
 {
        struct pnp_option *res = dev->dependent;
+       unsigned long tmp;
 
        for ( ; res ; res = res->next ) {
 
                struct pnp_irq *irq;
                struct pnp_dma *dma;
 
-               for( irq = res->irq; irq; irq = irq->next )     // Valid irqs are 5, 7, 10
-                       irq->map = 0x04A0;                                              // 0000 0100 1010 0000
+               for( irq = res->irq; irq; irq = irq->next ) {   // Valid irqs are 5, 7, 10
+                       tmp = 0x04A0;
+                       bitmap_copy(irq->map, &tmp, 16);        // 0000 0100 1010 0000
+               }
 
                for( dma = res->dma; dma; dma = dma->next ) // Valid 8bit dma channels are 1,3
                        if( ( dma->flags & IORESOURCE_DMA_TYPE_MASK ) == IORESOURCE_DMA_8BIT )