diff options
| author | Mirko Vogt <mirko@openwrt.org> | 2008-12-13 01:54:56 +0000 |
|---|---|---|
| committer | Mirko Vogt <mirko@openwrt.org> | 2008-12-13 01:54:56 +0000 |
| commit | 4eec5435530060db9fa75ee3d363252eb73695e9 (patch) | |
| tree | 01f2bf78edb2e3bb1466df9bca72e068632d0e74 /target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch | |
| parent | b0f5b5307126b277c44fa71bbd8f105f6702a8c0 (diff) | |
| download | master-187ad058-4eec5435530060db9fa75ee3d363252eb73695e9.tar.gz master-187ad058-4eec5435530060db9fa75ee3d363252eb73695e9.tar.bz2 master-187ad058-4eec5435530060db9fa75ee3d363252eb73695e9.zip | |
change prefix for kernelpatchbase 2.6.26
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13619 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch')
| -rwxr-xr-x | target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch new file mode 100755 index 0000000000..69819836ae --- /dev/null +++ b/target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch @@ -0,0 +1,46 @@ +From 60018d983c0e7e8cc2f3b1669338b05c5b5356f8 Mon Sep 17 00:00:00 2001 +From: mokopatches <mokopatches@openmoko.org> +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 + |