summaryrefslogtreecommitdiff
path: root/target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch')
-rw-r--r--target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch
deleted file mode 100644
index 5fc57e3a5f..0000000000
--- a/target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 30659e6b5f8c44bc80a0e79ae2b40e7208ac2b51 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:54 +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 e50ebcf..60d2b1b 100644
---- a/drivers/pnp/resource.c
-+++ b/drivers/pnp/resource.c
-@@ -431,6 +431,7 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
- }
- }
-
-+#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) {
-@@ -438,6 +439,7 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
- return 0;
- free_dma(*dma);
- }
-+#endif
-
- /* check for conflicts with other pnp devices */
- pnp_for_each_dev(tdev) {
---
-1.5.6.5
-