diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 20:26:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 20:26:18 -0400 |
| commit | cdb7532f7be35c3675b1aed54d10e378014618b6 (patch) | |
| tree | 925df597b70c4a1de629fec68f9e4ebd3fd9e803 /fs | |
| parent | 7992018d979460af59fbae8a48f9641305aea438 (diff) | |
| parent | 31d106c68b1af88835a474556052d6efbfec99c5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix dreamcast build for IRQ changes.
sh: Fix clock multiplier on SH7722.
sh: Wire up kdump crash kernel exec in die().
sh: sr.bl toggling around idle sleep.
sh: disable genrtc support.
fs: Kill sh dependency for binfmt_flat.
sh: Disable psw support for R7785RP.
sh: Fix page size alignment in __copy_user_page().
sh: Fix up various compile warnings for SE boards.
sh: Wire up signalfd/timerfd/eventfd syscalls.
sh: revert addition of page fault notifiers
spelling fixes: arch/sh/
input: hp680_ts compile fixes.
sh: landisk: Header cleanups.
sh: landisk: rtc-rs5c313 support.
sh: Kill off pmb slab cache destructor.
sh: Fix up psw build rules for r7780rp.
sh: Shut up compiler warnings in __do_page_fault().
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Kconfig.binfmt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 74c64409ddbc..d4fc6095466d 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt | |||
| @@ -38,7 +38,7 @@ config BINFMT_ELF_FDPIC | |||
| 38 | 38 | ||
| 39 | config BINFMT_FLAT | 39 | config BINFMT_FLAT |
| 40 | tristate "Kernel support for flat binaries" | 40 | tristate "Kernel support for flat binaries" |
| 41 | depends on !MMU || SUPERH | 41 | depends on !MMU |
| 42 | help | 42 | help |
| 43 | Support uClinux FLAT format binaries. | 43 | Support uClinux FLAT format binaries. |
| 44 | 44 | ||