Pull pnpacpi into acpica branch

[linux-2.6-omap-h63xx.git] / drivers / acpi / pci_link.c

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 492170373494f89ad4ad11b825053886469e482d..1ffc771153679c2dbd247d124b2a2d9ef71a7723 100644 (file)
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -316,7 +316,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
        if (!link || !irq)
                return_VALUE(-EINVAL);
 
-       resource = kmalloc(sizeof(*resource) + 1, GFP_KERNEL);
+       resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC);
        if (!resource)
                return_VALUE(-ENOMEM);