Merge branch 'linus' into x86/quirks

[deliverable/linux.git] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 9e561ede0925b6928bb44907c1bcde6ee4139d43..9d1552a9ee2c88ddb40bc7d70dea316f725d2843 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,6 +5,7 @@
 config FRV
        bool
        default y
+       select HAVE_IDE
 
 config ZONE_DMA
        bool
@@ -65,6 +66,8 @@ mainmenu "Fujitsu FR-V Kernel Configuration"
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 
 menu "Fujitsu FR-V system setup"