From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Jul 2008 20:25:05 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.27-rc1~82
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb3b80614438f8b73b3879a19350439d6aa402da;p=linux-2.6

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, AMD IOMMU: include amd_iommu_last_bdf in device initialization
  x86: fix IBM Summit based systems' phys_cpu_present_map on 32-bit kernels
  x86, RDC321x: remove gpio.h complications
  x86, RDC321x: add to mach-default
  crashdump: fix undefined reference to `elfcorehdr_addr'
  flag parameters: fix compile error of sys_epoll_create1
---

fb3b80614438f8b73b3879a19350439d6aa402da
diff --cc arch/x86/Kconfig
index 6bdde84581,39ae679859..b6fa2877b1
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -22,9 -22,8 +22,9 @@@ config X8
  	select HAVE_IDE
  	select HAVE_OPROFILE
  	select HAVE_IOREMAP_PROT
 +	select HAVE_GET_USER_PAGES_FAST
  	select HAVE_KPROBES
- 	select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X
+ 	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select HAVE_KRETPROBES
  	select HAVE_DYNAMIC_FTRACE
  	select HAVE_FTRACE