Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig updates from Michal Marek:
 "Yann E Morin was supposed to take over kconfig maintainership, but
  this hasn't happened.  So I'm sending a few kconfig patches that I
  collected:

   - Fix for missing va_end in kconfig
   - merge_config.sh displays used if given too few arguments
   - s/boolean/bool/ in Kconfig files for consistency, with the plan to
     only support bool in the future"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: use va_end to match corresponding va_start
  merge_config.sh: Display usage if given too few arguments
  kconfig: use bool instead of boolean for type definition attributes

4 files changed, 21 insertions, 21 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 96539038c03a..b454d05be583 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -45,7 +45,7 @@ menuconfig USB_GADGET
 if USB_GADGET
 
 config USB_GADGET_DEBUG
-        boolean "Debugging messages (DEVELOPMENT)"
+        bool "Debugging messages (DEVELOPMENT)"
         depends on DEBUG_KERNEL
         help
            Many controller and gadget drivers will print some debugging
@@ -73,7 +73,7 @@ config USB_GADGET_VERBOSE
            production build.
 
 config USB_GADGET_DEBUG_FILES
-        boolean "Debugging information files (DEVELOPMENT)"
+        bool "Debugging information files (DEVELOPMENT)"
         depends on PROC_FS
         help
            Some of the drivers in the "gadget" framework can expose
@@ -84,7 +84,7 @@ config USB_GADGET_DEBUG_FILES
            here.  If in doubt, or to conserve kernel memory, say "N".
 
 config USB_GADGET_DEBUG_FS
-        boolean "Debugging information files in debugfs (DEVELOPMENT)"
+        bool "Debugging information files in debugfs (DEVELOPMENT)"
         depends on DEBUG_FS
         help
            Some of the drivers in the "gadget" framework can expose
@@ -230,7 +230,7 @@ config USB_CONFIGFS
           For more information see Documentation/usb/gadget_configfs.txt.
 
 config USB_CONFIGFS_SERIAL
-        boolean "Generic serial bulk in/out"
+        bool "Generic serial bulk in/out"
         depends on USB_CONFIGFS
         depends on TTY
         select USB_U_SERIAL
@@ -239,7 +239,7 @@ config USB_CONFIGFS_SERIAL
           The function talks to the Linux-USB generic serial driver.
 
 config USB_CONFIGFS_ACM
-        boolean "Abstract Control Model (CDC ACM)"
+        bool "Abstract Control Model (CDC ACM)"
         depends on USB_CONFIGFS
         depends on TTY
         select USB_U_SERIAL
@@ -249,7 +249,7 @@ config USB_CONFIGFS_ACM
           MS-Windows hosts or with the Linux-USB "cdc-acm" driver.
 
 config USB_CONFIGFS_OBEX
-        boolean "Object Exchange Model (CDC OBEX)"
+        bool "Object Exchange Model (CDC OBEX)"
         depends on USB_CONFIGFS
         depends on TTY
         select USB_U_SERIAL
@@ -259,7 +259,7 @@ config USB_CONFIGFS_OBEX
           since the kernel itself doesn't implement the OBEX protocol.
 
 config USB_CONFIGFS_NCM
-        boolean "Network Control Model (CDC NCM)"
+        bool "Network Control Model (CDC NCM)"
         depends on USB_CONFIGFS
         depends on NET
         select USB_U_ETHER
@@ -270,7 +270,7 @@ config USB_CONFIGFS_NCM
           different alignment possibilities.
 
 config USB_CONFIGFS_ECM
-        boolean "Ethernet Control Model (CDC ECM)"
+        bool "Ethernet Control Model (CDC ECM)"
         depends on USB_CONFIGFS
         depends on NET
         select USB_U_ETHER
@@ -282,7 +282,7 @@ config USB_CONFIGFS_ECM
           supported by firmware for smart network devices.
 
 config USB_CONFIGFS_ECM_SUBSET
-        boolean "Ethernet Control Model (CDC ECM) subset"
+        bool "Ethernet Control Model (CDC ECM) subset"
         depends on USB_CONFIGFS
         depends on NET
         select USB_U_ETHER
@@ -323,7 +323,7 @@ config USB_CONFIGFS_EEM
           the host is the same (a usbX device), so the differences are minimal.
 
 config USB_CONFIGFS_PHONET
-        boolean "Phonet protocol"
+        bool "Phonet protocol"
         depends on USB_CONFIGFS
         depends on NET
         depends on PHONET
@@ -333,7 +333,7 @@ config USB_CONFIGFS_PHONET
           The Phonet protocol implementation for USB device.
 
 config USB_CONFIGFS_MASS_STORAGE
-        boolean "Mass storage"
+        bool "Mass storage"
         depends on USB_CONFIGFS
         depends on BLOCK
         select USB_F_MASS_STORAGE
@@ -344,7 +344,7 @@ config USB_CONFIGFS_MASS_STORAGE
           specified as a module parameter or sysfs option.
 
 config USB_CONFIGFS_F_LB_SS
-        boolean "Loopback and sourcesink function (for testing)"
+        bool "Loopback and sourcesink function (for testing)"
         depends on USB_CONFIGFS
         select USB_F_SS_LB
         help
@@ -357,7 +357,7 @@ config USB_CONFIGFS_F_LB_SS
           and its driver through a basic set of functional tests.
 
 config USB_CONFIGFS_F_FS
-        boolean "Function filesystem (FunctionFS)"
+        bool "Function filesystem (FunctionFS)"
         depends on USB_CONFIGFS
         select USB_F_FS
         help
@@ -369,7 +369,7 @@ config USB_CONFIGFS_F_FS
           mass storage) and other are implemented in user space.
 
 config USB_CONFIGFS_F_UAC1
-        boolean "Audio Class 1.0"
+        bool "Audio Class 1.0"
         depends on USB_CONFIGFS
         depends on SND
         select USB_LIBCOMPOSITE
@@ -382,7 +382,7 @@ config USB_CONFIGFS_F_UAC1
           on the device.
 
 config USB_CONFIGFS_F_UAC2
-        boolean "Audio Class 2.0"
+        bool "Audio Class 2.0"
         depends on USB_CONFIGFS
         depends on SND
         select USB_LIBCOMPOSITE
@@ -400,7 +400,7 @@ config USB_CONFIGFS_F_UAC2
           wants as audio data to the USB Host.
 
 config USB_CONFIGFS_F_MIDI
-        boolean "MIDI function"
+        bool "MIDI function"
         depends on USB_CONFIGFS
         depends on SND
         select USB_LIBCOMPOSITE
@@ -414,7 +414,7 @@ config USB_CONFIGFS_F_MIDI
           ALSA's aconnect utility etc.
 
 config USB_CONFIGFS_F_HID
-        boolean "HID function"
+        bool "HID function"
         depends on USB_CONFIGFS
         select USB_F_HID
         help
diff --git a/drivers/usb/gadget/legacy/Kconfig b/drivers/usb/gadget/legacy/Kconfig
index fd48ef3af4eb..113c87e22117 100644
--- a/drivers/usb/gadget/legacy/Kconfig
+++ b/drivers/usb/gadget/legacy/Kconfig
@@ -40,7 +40,7 @@ config USB_ZERO
           dynamically linked module called "g_zero".
 
 config USB_ZERO_HNPTEST
-        boolean "HNP Test Device"
+        bool "HNP Test Device"
         depends on USB_ZERO && USB_OTG
         help
           You can configure this device to enumerate using the device
diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
index 366e551aeff0..9a3a6b00391a 100644
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@ -199,7 +199,7 @@ config USB_S3C2410
           S3C2440 processors.
 
 config USB_S3C2410_DEBUG
-        boolean "S3C2410 udc debug messages"
+        bool "S3C2410 udc debug messages"
         depends on USB_S3C2410
 
 config USB_S3C_HSUDC
@@ -288,7 +288,7 @@ config USB_NET2272
           gadget drivers to also be dynamically linked.
 
 config USB_NET2272_DMA
-        boolean "Support external DMA controller"
+        bool "Support external DMA controller"
         depends on USB_NET2272 && HAS_DMA
         help
           The NET2272 part can optionally support an external DMA
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index c6d0c8e745b9..52d3d58252e1 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -119,7 +119,7 @@ config TAHVO_USB
 
 config TAHVO_USB_HOST_BY_DEFAULT
         depends on TAHVO_USB
-        boolean "Device in USB host mode by default"
+        bool "Device in USB host mode by default"
         help
           Say Y here, if you want the device to enter USB host mode
           by default on bootup.