aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
commita4ffbea09c88fbe9cefcf0080eda0809598f3ee1 (patch)
treef3261452de6d5a1c11fd8ed250f2a42f6d0eb008 /target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
parentd9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76 (diff)
downloadupstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.gz
upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.bz2
upstream-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.zip
[kernel] update to 2.6.25.19, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
index 21e89cddff..9071b7cb34 100644
--- a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
@@ -4,7 +4,7 @@ Remove this sanity check for now until we find a better solution.
--mb
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
-@@ -182,12 +182,10 @@
+@@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru
if ((idx == PCI_ROM_RESOURCE) &&
(!(r->flags & IORESOURCE_ROM_ENABLE)))
continue;