summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2008-04-06 10:21:21 +0000
committerRod Whitby <rod@whitby.id.au>2008-04-06 10:21:21 +0000
commitc8bac89584dc04c43d6714cfdd342382c9343787 (patch)
treee35b0a27b32e0f9e372f1e67ffdd1eced0047c45
parent3b3044347967ff6a55a1af91abc1a88f7a8b7d67 (diff)
parentbbc0a682a9457cddec1f61ca72d0c108ee3b890f (diff)
merge of '4d43ab58fc4f4986ece87cba9814bd2c1a63434d'
and 'bcc47d35b4f4f02379b2ed9b7110078ab656814a'
-rw-r--r--packages/linux/linux-ixp4xx/defconfig-2.6.24.42
-rw-r--r--packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.42
-rw-r--r--packages/linux/linux-ixp4xx_2.6.24.4.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
index de78fc3741..555248c29d 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
@@ -163,7 +163,7 @@ CONFIG_MACH_FSG=y
# IXP4xx Options
#
CONFIG_DMABOUNCE=y
-CONFIG_DMABOUNCE_DEBUG=y
+# CONFIG_DMABOUNCE_DEBUG is not set
# CONFIG_IXP4XX_INDIRECT_PCI is not set
CONFIG_IXP4XX_QMGR=y
CONFIG_IXP4XX_NPE=y
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
index 2a382b34b3..d4cfa7c6fd 100644
--- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
+++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
@@ -163,7 +163,7 @@ CONFIG_MACH_FSG=y
# IXP4xx Options
#
CONFIG_DMABOUNCE=y
-CONFIG_DMABOUNCE_DEBUG=y
+# CONFIG_DMABOUNCE_DEBUG is not set
# CONFIG_IXP4XX_INDIRECT_PCI is not set
CONFIG_IXP4XX_QMGR=y
CONFIG_IXP4XX_NPE=y
diff --git a/packages/linux/linux-ixp4xx_2.6.24.4.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb
index 1be0724e2f..1964c23839 100644
--- a/packages/linux/linux-ixp4xx_2.6.24.4.bb
+++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb
@@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.24.4"
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-# PR = "r1"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \