aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordann frazier <dannf@debian.org>2007-03-22 23:22:33 +0000
committerdann frazier <dannf@debian.org>2007-03-22 23:22:33 +0000
commitb905d5d061178c17709b6acb2171cf75bf209737 (patch)
tree87407ee16cffec3f2408386f2e2b3fb4028d25b5
parenta06bf84ce13a17476feb9d9ded118a601c1896ae (diff)
downloadkernel_replicant_linux-b905d5d061178c17709b6acb2171cf75bf209737.tar.gz
kernel_replicant_linux-b905d5d061178c17709b6acb2171cf75bf209737.tar.bz2
kernel_replicant_linux-b905d5d061178c17709b6acb2171cf75bf209737.zip
* Enable CONFIG_TULIP_MMIO on hppa. (closes: #332962)
svn path=/dists/etch/linux-2.6/; revision=8387
-rw-r--r--debian/arch/hppa/config2
-rw-r--r--debian/changelog3
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config
index 396e3b223857..43532699939e 100644
--- a/debian/arch/hppa/config
+++ b/debian/arch/hppa/config
@@ -309,7 +309,7 @@ CONFIG_NET_TULIP=y
# CONFIG_DE2104X is not set
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_MMIO=y
# CONFIG_DE4X5 is not set
# CONFIG_WINBOND_840 is not set
# CONFIG_DM9102 is not set
diff --git a/debian/changelog b/debian/changelog
index 3577bcfde407..7cbfe8c9ab5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,8 +40,9 @@ linux-2.6 (2.6.18.dfsg.1-12) UNRELEASED; urgency=low
[SECURITY] Fix kernel memory leak vulnerability in
ipv6_getsockopt_sticky() which can be triggered by passing a len < 0.
See CVE-2007-1000
+ * Enable CONFIG_TULIP_MMIO on hppa. (closes: #332962)
- -- dann frazier <dannf@debian.org> Thu, 22 Mar 2007 10:31:41 -0600
+ -- dann frazier <dannf@debian.org> Thu, 22 Mar 2007 13:03:16 -0600
linux-2.6 (2.6.18.dfsg.1-11) unstable; urgency=low