summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-04-06 22:19:45 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-04-06 22:19:45 +0000
commitfbca01e0fc7d470346573de02b3f0e7dbf8dd6a4 (patch)
treeef3946b7818975a48f41d8508c150ff354783e7a /packages
parent1d3489029167ab63158a96e8d76489668dbaa2d7 (diff)
parent5213e7b3522b716c284b14cdfb2f51cc5e57e7e3 (diff)
merge of '262ebdec7339ba774fffa1aa586eb226acd32493'
and '7ce1c09c2ab95fc13a699ae089ac05fba3e7024c'
Diffstat (limited to 'packages')
-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 \