diff options
| author | mokopatches <mokopatches@openmoko.org> | 2008-11-19 17:03:19 +0000 |
|---|---|---|
| committer | warmcat <andy@warmcat.com> | 2008-11-19 17:03:19 +0000 |
| commit | 04f702b8cae122213b1e6f40341274eff4720fa2 (patch) | |
| tree | 703156a57a883305812777d553c8466d7df02785 /drivers/pnp | |
| parent | 070ee836a73d79e2b51184e8aef99f34a050b645 (diff) | |
pnp_fixes.patch
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pnp/resource.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig index 2a37b3fedb8..a79621dc5ed 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 f604061d2bb..e561b1c2001 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -436,6 +436,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) { @@ -443,6 +444,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) { |