diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /arch/mips/Kconfig | |
parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 4da736e25333..49896a2a1d72 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1886,6 +1886,15 @@ config STACKTRACE_SUPPORT | |||
1886 | 1886 | ||
1887 | source "init/Kconfig" | 1887 | source "init/Kconfig" |
1888 | 1888 | ||
1889 | config PROBE_INITRD_HEADER | ||
1890 | bool "Probe initrd header created by addinitrd" | ||
1891 | depends on BLK_DEV_INITRD | ||
1892 | help | ||
1893 | Probe initrd header at the last page of kernel image. | ||
1894 | Say Y here if you are using arch/mips/boot/addinitrd.c to | ||
1895 | add initrd or initramfs image to the kernel image. | ||
1896 | Otherwise, say N. | ||
1897 | |||
1889 | menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" | 1898 | menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" |
1890 | 1899 | ||
1891 | config HW_HAS_EISA | 1900 | config HW_HAS_EISA |