Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index dff9edfc7465..8fa3faf5ef1b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -18,6 +18,7 @@ config IA64
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_KPROBES
+        select HAVE_KRETPROBES
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
@@ -155,6 +156,8 @@ config IA64_HP_ZX1_SWIOTLB
 
 config IA64_SGI_SN2
         bool "SGI-SN2"
+        select NUMA
+        select ACPI_NUMA
         help
           Selecting this option will optimize the kernel for use on sn2 based
           systems, but the resulting kernel binary will not run on other