From 60018d983c0e7e8cc2f3b1669338b05c5b5356f8 Mon Sep 17 00:00:00 2001 From: mokopatches Date: Fri, 25 Jul 2008 22:21:24 +0100 Subject: [PATCH] pnp_fixes.patch --- drivers/pnp/Kconfig | 2 +- drivers/pnp/resource.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig index 821933f..f9313cf 100644 --- a/drivers/pnp/Kconfig +++ b/drivers/pnp/Kconfig @@ -5,7 +5,7 @@ menuconfig PNP bool "Plug and Play support" depends on HAS_IOMEM - depends on ISA || ACPI + depends on ISA || ACPI || SDIO ---help--- Plug and Play (PnP) is a standard for peripherals which allows those peripherals to be configured by software, e.g. assign IRQ's or other diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 390b500..3aabbf6 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -468,6 +468,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res) } } +#if 0 /* check if the resource is already in use, skip if the * device is active because it itself may be in use */ if (!dev->active) { @@ -475,6 +476,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res) return 0; free_dma(*dma); } +#endif /* check for conflicts with other pnp devices */ pnp_for_each_dev(tdev) { -- 1.5.6.3