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

8 files changed, 29 insertions, 30 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 9e3d0bdcba0..5c0a10041cd 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 ec752e16d61..f2dc363de66 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
diff --git a/arch/powerpc/platforms/4xx/Kconfig b/arch/powerpc/platforms/4xx/Kconfig
index ed39d6a3d22..2f2a13ed766 100644
--- a/arch/powerpc/platforms/4xx/Kconfig
+++ b/arch/powerpc/platforms/4xx/Kconfig
@@ -179,7 +179,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
         bool
-        depends OAK
+        depends on OAK
         default y
 
 config 405EP
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index ddbe398fbd4..b3c2ce4cb7a 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -35,7 +35,7 @@ config HDPU
           Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-        depends HDPU
+        depends on HDPU
         tristate "HDPU-Features"
         help
           Select to enable HDPU enhanced features.
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 692b5ba5320..8eb82efe05a 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -624,7 +624,7 @@ config HDPU
           Select HDPU if configuring a Sky Computers Compute Blade.
 
 config HDPU_FEATURES
-        depends HDPU
+        depends on HDPU
         tristate "HDPU-Features"
         help
           Select to enable HDPU enhanced features.
@@ -735,7 +735,7 @@ config LITE5200
 
 config LITE5200B
         bool "Freescale LITE5200B"
-        depends LITE5200
+        depends on LITE5200
         help
           Support for the LITE5200B dev board for the MPC5200 from Freescale.
           This is the new board with 2 PCI slots.
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
index 293bd489e7d..6980de420e9 100644
--- a/arch/ppc/platforms/4xx/Kconfig
+++ b/arch/ppc/platforms/4xx/Kconfig
@@ -189,7 +189,7 @@ config BIOS_FIXUP
 # OAK doesn't exist but wanted to keep this around for any future 403GCX boards
 config 403GCX
         bool
-        depends OAK
+        depends on OAK
         default y
 
 config 405EP
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 286bc0b3207..b2e9762e13c 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -334,13 +334,12 @@ static int eth_configure(int n, void *init, char *mac,
         size = transport->private_size + sizeof(struct uml_net_private) + 
                 sizeof(((struct uml_net_private *) 0)->user);
 
-        device = kmalloc(sizeof(*device), GFP_KERNEL);
+        device = kzalloc(sizeof(*device), GFP_KERNEL);
         if (device == NULL) {
                 printk(KERN_ERR "eth_configure failed to allocate uml_net\n");
                 return(1);
         }
 
-        memset(device, 0, sizeof(*device));
         INIT_LIST_HEAD(&device->list);
         device->index = n;
 
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index bcf825875d1..f0d4d72e560 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -105,17 +105,17 @@ menu "Processor type and features"
    # currently support
    config V850E_MA1
           bool
-          depends RTE_CB_MA1
+          depends on RTE_CB_MA1
           default y
    # Similarly for the RTE-V850E/NB85E-CB - V850E/TEG
    config V850E_TEG
           bool
-          depends RTE_CB_NB85E
+          depends on RTE_CB_NB85E
           default y
    # ... and the RTE-V850E/ME2-CB - V850E/ME2
    config V850E_ME2
           bool
-          depends RTE_CB_ME2
+          depends on RTE_CB_ME2
           default y
 
 
@@ -123,7 +123,7 @@ menu "Processor type and features"
 
    config V850E2_SIM85E2
           bool
-          depends V850E2_SIM85E2C || V850E2_SIM85E2S
+          depends on V850E2_SIM85E2C || V850E2_SIM85E2S
           default y
 
 
@@ -132,7 +132,7 @@ menu "Processor type and features"
    # V850E2 processors
    config V850E2
           bool
-          depends V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
+          depends on V850E2_SIM85E2 || V850E2_FPGA85E2C || V850E2_ANNA
           default y
 
 
@@ -141,7 +141,7 @@ menu "Processor type and features"
    # Boards in the RTE-x-CB series
    config RTE_CB
           bool
-          depends RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
+          depends on RTE_CB_MA1 || RTE_CB_NB85E || RTE_CB_ME2
           default y
 
    config RTE_CB_MULTI
@@ -149,28 +149,28 @@ menu "Processor type and features"
           # RTE_CB_NB85E can either have multi ROM support or not, but
           # other platforms (currently only RTE_CB_MA1) require it.
           prompt "Multi monitor ROM support" if RTE_CB_NB85E
-          depends RTE_CB_MA1 || RTE_CB_NB85E
+          depends on RTE_CB_MA1 || RTE_CB_NB85E
           default y
 
    config RTE_CB_MULTI_DBTRAP
           bool "Pass illegal insn trap / dbtrap to kernel"
-          depends RTE_CB_MULTI
+          depends on RTE_CB_MULTI
           default n
 
    config RTE_CB_MA1_KSRAM
           bool "Kernel in SRAM (limits size of kernel)"
-          depends RTE_CB_MA1 && RTE_CB_MULTI
+          depends on RTE_CB_MA1 && RTE_CB_MULTI
           default n
 
    config RTE_MB_A_PCI
           bool "Mother-A PCI support"
-          depends RTE_CB
+          depends on RTE_CB
           default y
 
    # The GBUS is used to talk to the RTE-MOTHER-A board
    config RTE_GBUS_INT
           bool
-          depends RTE_MB_A_PCI
+          depends on RTE_MB_A_PCI
           default y
 
    # The only PCI bus we support is on the RTE-MOTHER-A board
@@ -209,7 +209,7 @@ menu "Processor type and features"
 
    config ROM_KERNEL
           bool "Kernel in ROM"
-          depends V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
+          depends on V850E2_ANNA || V850E_AS85EP1 || RTE_CB_ME2
 
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    config ZERO_BSS
@@ -225,10 +225,10 @@ menu "Processor type and features"
 
    config V850E_HIGHRES_TIMER
           bool "High resolution timer support"
-          depends V850E_TIMER_D
+          depends on V850E_TIMER_D
    config TIME_BOOTUP
           bool "Time bootup"
-          depends V850E_HIGHRES_TIMER
+          depends on V850E_HIGHRES_TIMER
 
    config RESET_GUARD
           bool "Reset Guard"