diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
| commit | e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1 (patch) | |
| tree | 4f84567261682d8ec2ad4102bce1ff970a6eed1a /arch/mips/Kconfig | |
| parent | 9fcaff0e660d886e9a766460adbe558dd25de31b (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/iommu
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 |