The following commit has been merged in the linux branch: commit 0d43f5123d1456669b3bbc69854faf6fd5b14caa Merge: fb3165b59f9ce510fed07262db20fdb799f88fa6 ffb4a73d8906f71910e6c83ec2b499e70025ee8e Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 09:07:15 2009 -0700
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix hugetlbfs dependencies for SH-3 && MMU configurations. sh: Document uImage.bin target in archhelp. sh: add uImage.bin target sh: rsk7203 CONFIG_MTD=n fix sh: Check for return_to_handler when unwinding the stack sh: Build fix: define more __movmem* symbols sh: __irq_entry annotate do_IRQ().
Fix up sh/powerpc conflicts in fs/Kconfig
diff --combined fs/Kconfig index f93d0ed,48b81f9..2126078 --- a/fs/Kconfig +++ b/fs/Kconfig @@@ -135,8 -135,8 +135,8 @@@ config TMPFS_POSIX_AC
config HUGETLBFS bool "HugeTLB file system support" - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (SUPERH && MMU) || \ - (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN - depends on X86 || IA64 || PPC64 || SPARC64 || (S390 && 64BIT) || \ ++ depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 && 64BIT) || \ + SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on ramfs. For architectures that support it, say Y here and read