5fc57e3a5fa3e20e3204252315c853d3e9d80f09
[openwrt/openwrt.git] / target / linux / s3c24xx / patches-2.6.24 / 1062-pnp_fixes.patch.patch
1 From 30659e6b5f8c44bc80a0e79ae2b40e7208ac2b51 Mon Sep 17 00:00:00 2001
2 From: mokopatches <mokopatches@openmoko.org>
3 Date: Sun, 13 Apr 2008 07:23:54 +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 e50ebcf..60d2b1b 100644
26 --- a/drivers/pnp/resource.c
27 +++ b/drivers/pnp/resource.c
28 @@ -431,6 +431,7 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
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 @@ -438,6 +439,7 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
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.5
46