summaryrefslogtreecommitdiff
path: root/arch/alpha/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-14 04:28:05 +0400
committerJeff Garzik <jeff@garzik.org>2006-06-14 04:28:05 +0400
commitdb9ca5803566078aafe63cf364ef98b5097e4194 (patch)
treece330cdf21728f00801004e3900c79e4195cd516 /arch/alpha/Kconfig
parentbf717b11aec20965d48dea36dea3eea18a75d18c (diff)
parenteb35cf60e462491249166182e3e755d3d5d91a28 (diff)
downloadlinux-db9ca5803566078aafe63cf364ef98b5097e4194.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'arch/alpha/Kconfig')
-rw-r--r--arch/alpha/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8290b69da202..213c7850d5fb 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -453,7 +453,7 @@ config ALPHA_IRONGATE
config GENERIC_HWEIGHT
bool
- default y if !ALPHA_EV6 && !ALPHA_EV67
+ default y if !ALPHA_EV67
config ALPHA_AVANTI
bool