Commit 775ba7ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d9405057 18b36c71

Documentation/kbuild/kconfig-language.txt

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ them. A single configuration option is defined like this: 


config MODVERSIONS

	bool "Set version information on all module symbols"

	depends MODULES

	depends on MODULES

	help

	  Usually, modules have to be recompiled whenever you switch to a new

	  kernel.  ...
@@ -163,7 +163,7 @@ The position of a menu entry in the tree is determined in two ways. First 
it can be specified explicitly:



menu "Network device support"

	depends NET

	depends on NET



config NETDEVICES

	...
@@ -188,10 +188,10 @@ config MODULES 


config MODVERSIONS

	bool "Set version information on all module symbols"

	depends MODULES

	depends on MODULES



comment "module support disabled"

	depends !MODULES

	depends on !MODULES



MODVERSIONS directly depends on MODULES, this means it's only visible if

MODULES is different from 'n'. The comment on the other hand is always

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -1504,8 +1504,10 @@ T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git 
S:	Maintained



INOTIFY

P:	John McCutchan and Robert Love

M:	ttb@tentacle.dhs.org and rml@novell.com

P:	John McCutchan

M:	ttb@tentacle.dhs.org

P:	Robert Love

M:	rml@novell.com

L:	linux-kernel@vger.kernel.org

S:	Maintained

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -1100,9 +1100,9 @@ boards := $(notdir $(boards)) 


help:

	@echo  'Cleaning targets:'

	@echo  '  clean		  - remove most generated files but keep the config and'

	@echo  '  clean		  - Remove most generated files but keep the config and'

	@echo  '                    enough build support to build external modules'

	@echo  '  mrproper	  - remove all generated files + config + various backup files'

	@echo  '  mrproper	  - Remove all generated files + config + various backup files'

	@echo  '  distclean	  - mrproper + remove editor backup and patch files'

	@echo  ''

	@echo  'Configuration targets:'

arch/arm/mach-pxa/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-omap/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE