[ARM] 4652/1: pxa: fix a typo of pxa27x usb host clk definition

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 03c4e5c1b94a5ae3f6cda7c836b40ffee60ff127..10b212a1f9f5aa046dbe1e2b5702dbcba9a3b7c0 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -408,7 +408,7 @@ config SUNOS_EMUL
 
 config SOLARIS_EMUL
        tristate "Solaris binary emulation (EXPERIMENTAL)"
 
 config SOLARIS_EMUL
        tristate "Solaris binary emulation (EXPERIMENTAL)"

-       depends on SPARC32_COMPAT && EXPERIMENTAL
+       depends on SPARC32_COMPAT && NET && EXPERIMENTAL

        help
          This is experimental code which will enable you to run (many)
          Solaris binaries on your SPARC Linux machine.
        help
          This is experimental code which will enable you to run (many)
          Solaris binaries on your SPARC Linux machine.


@@ -460,8 +460,6 @@ source "drivers/Kconfig"
 
 source "drivers/sbus/char/Kconfig"
 
 
 source "drivers/sbus/char/Kconfig"
 

-source "drivers/fc4/Kconfig"
-

 source "fs/Kconfig"
 
 source "kernel/Kconfig.instrumentation"
 source "fs/Kconfig"
 
 source "kernel/Kconfig.instrumentation"