diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 17:40:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 17:40:19 +0200 |
| commit | 1c89ac55017f982355c7761e1c912c88c941483d (patch) | |
| tree | 6878e95a0572defc725ea58f5a1449db937a5066 /arch/x86/Kconfig | |
| parent | Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | fix spinlock recursion in hvc_console (diff) | |
| download | linux-1c89ac55017f982355c7761e1c912c88c941483d.tar.xz linux-1c89ac55017f982355c7761e1c912c88c941483d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
fix spinlock recursion in hvc_console
stop_machine: remove unused variable
modules: extend initcall_debug functionality to the module loader
export virtio_rng.h
lguest: use get_user_pages_fast() instead of get_user_pages()
mm: Make generic weak get_user_pages_fast and EXPORT_GPL it
lguest: don't set MAC address for guest unless specified
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 3d0f2b6a5a16..ac2fb0641a04 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -22,7 +22,6 @@ config X86 select HAVE_IDE select HAVE_OPROFILE select HAVE_IOREMAP_PROT - select HAVE_GET_USER_PAGES_FAST select HAVE_KPROBES select ARCH_WANT_OPTIONAL_GPIOLIB select HAVE_KRETPROBES |