Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Fix inotify maintainers entry
  Fix typo in new debug options.
  Jon needs a new shift key.
  fs: Convert kmalloc() + memset() to kzalloc() in fs/.
  configfs.h: Remove dead macro definitions.
  kconfig: Standardize "depends" -> "depends on" in Kconfig files
  e100: replace kmalloc with kcalloc
  um: replace kmalloc+memset with kzalloc
  fix typo in net/ipv4/ip_fragment.c
  include/linux/compiler.h: reject gcc 3 < gcc 3.2
  Kconfig: fix spelling error in config KALLSYMS help text
  Remove duplicate "have to" in comment
  Fix small typo in drivers/serial/icom.c
  Use consistent casing in help message
  EXT{2,3,4}_FS: remove outdated part of the help text

2 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 9e3d0bdcba07..5c0a10041cd1 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -75,28 +75,28 @@ endmenu
 
 config MACH_POODLE
         bool "Enable Sharp SL-5600 (Poodle) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select SHARP_LOCOMO
         select PXA_SSP
 
 config MACH_CORGI
         bool "Enable Sharp SL-C700 (Corgi) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_SHEPHERD
         bool "Enable Sharp SL-C750 (Shepherd) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_HUSKY
         bool "Enable Sharp SL-C760 (Husky) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
         select PXA_SHARP_C7xx
 
 config MACH_AKITA
         bool "Enable Sharp SL-1000 (Akita) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
         select MACH_SPITZ
         select I2C
@@ -104,17 +104,17 @@ config MACH_AKITA
 
 config MACH_SPITZ
         bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
 
 config MACH_BORZOI
         bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-        depends PXA_SHARPSL_27x
+        depends on PXA_SHARPSL_27x
         select PXA_SHARP_Cxx00
 
 config MACH_TOSA
         bool "Enable Sharp SL-6000x (Tosa) Support"
-        depends PXA_SHARPSL_25x
+        depends on PXA_SHARPSL_25x
 
 config PXA25x
         bool
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index ec752e16d618..f2dc363de66b 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -113,7 +113,7 @@ endchoice
 
 config OMAP_SERIAL_WAKE
         bool "Enable wake-up events for serial ports"
-        depends OMAP_MUX
+        depends on OMAP_MUX
         default y
         help
           Select this option if you want to have your system wake up