target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch

   1 From 60018d983c0e7e8cc2f3b1669338b05c5b5356f8 Mon Sep 17 00:00:00 2001
   2 From: mokopatches <mokopatches@openmoko.org>
   3 Date: Fri, 25 Jul 2008 22:21:24 +0100
   4 Subject: [PATCH] pnp_fixes.patch
   5
   6 ---
   7  drivers/pnp/Kconfig    |    2 +-
   8  drivers/pnp/resource.c |    2 ++
   9  2 files changed, 3 insertions(+), 1 deletions(-)
  10
  11 diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
  12 index 821933f..f9313cf 100644
  13 --- a/drivers/pnp/Kconfig
  14 +++ b/drivers/pnp/Kconfig
  15 @@ -5,7 +5,7 @@
  16  menuconfig PNP
  17         bool "Plug and Play support"
  18         depends on HAS_IOMEM
  19 -       depends on ISA || ACPI
  20 +       depends on ISA || ACPI || SDIO
  21         ---help---
  22           Plug and Play (PnP) is a standard for peripherals which allows those
  23           peripherals to be configured by software, e.g. assign IRQ's or other
  24 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
  25 index 390b500..3aabbf6 100644
  26 --- a/drivers/pnp/resource.c
  27 +++ b/drivers/pnp/resource.c
  28 @@ -468,6 +468,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
  29                 }
  30         }
  31
  32 +#if 0
  33         /* check if the resource is already in use, skip if the
  34          * device is active because it itself may be in use */
  35         if (!dev->active) {
  36 @@ -475,6 +476,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
  37                         return 0;
  38                 free_dma(*dma);
  39         }
  40 +#endif
  41
  42         /* check for conflicts with other pnp devices */
  43         pnp_for_each_dev(tdev) {
  44 --
  45 1.5.6.3
  46