diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-08 13:34:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-08 13:34:54 -0400 |
| commit | 0f2df9eac70423838a1f8d410fd3899ddd88317b (patch) | |
| tree | 0617f723320d83eca5cef9c964c001014e74213f /arch/ia64/configs/zx1_defconfig | |
| parent | 8c11e4ab09ffb975a89802dde0e9aa52a53b8aa5 (diff) | |
| parent | 1144601118507f8b3b676a9a392584d216d3f2cc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-tx.c
Diffstat (limited to 'arch/ia64/configs/zx1_defconfig')
| -rw-r--r-- | arch/ia64/configs/zx1_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 514f0635daf..3cec65b534c 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig @@ -150,8 +150,6 @@ CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_VIRTUAL_MEM_MAP=y CONFIG_HOLES_IN_ZONE=y -CONFIG_IA32_SUPPORT=y -CONFIG_COMPAT=y CONFIG_IA64_MCA_RECOVERY=y CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y |