Merge branch 'acpi-misc'

[linux-2.6-microblaze.git] / include / linux / ioport.h

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 55de385..647744d 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -331,7 +331,7 @@ static inline void irqresource_disabled(struct resource *res, u32 irq)
 {
        res->start = irq;
        res->end = irq;
-       res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
+       res->flags |= IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
 }
 
 extern struct address_space *iomem_get_mapping(void);