Merge branch 'kconfig'

23 files changed, 37 insertions, 40 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index f6446e8413..988ec9ee06 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -1,4 +1,4 @@
-menu "Drivers                       "
+menu "Drivers"
 
 source "drivers/serial/Kconfig"
 source "drivers/net/Kconfig"
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index b10c5c7c7a..ff6528acf4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -2,7 +2,7 @@ menuconfig DISK
 	select BLOCK
 	select PARTITION
 	select PARTITION_DISK
-	bool "Disk support                  "
+	bool "Disk support"
 	help
 	  Add support for disk like drives like harddisks, CDROMs, SD cards and
 	  CF cards.
@@ -29,7 +29,6 @@ config DISK_BIOS
 
 config DISK_ATA
 	bool "ATA type drives"
-	select DISK_DRIVE
 	help
 	  Support for native ATA/IDE drives
 
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 66c1c465e8..4589128dc6 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -1,7 +1,6 @@
 
 config CLKDEV_LOOKUP
 	bool
-	select HAVE_CLK
 
 config COMMON_CLK
 	bool
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index ec6c894771..a30fa375d1 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -4,5 +4,5 @@ config MXS_APBH_DMA
 	tristate "MXS APBH DMA ENGINE"
 	depends on ARCH_IMX23 || ARCH_IMX28
 	help
-	Experimental!
+	  Experimental!
 endmenu
diff --git a/drivers/eeprom/Kconfig b/drivers/eeprom/Kconfig
index ce9cfe7ec8..0e36c824ec 100644
--- a/drivers/eeprom/Kconfig
+++ b/drivers/eeprom/Kconfig
@@ -14,11 +14,11 @@ config EEPROM_AT24
 	help
 	  Enable this driver to get read/write support to most I2C EEPROMs,
 	  after you configure the driver to know about each EEPROM on
-	  your target board.  Use these generic chip names, instead of
+	  your target board. Use these generic chip names, instead of
 	  vendor-specific ones like at24c64 or 24lc02:
 
-	     24c00, 24c01, 24c02, spd (readonly 24c02), 24c04, 24c08,
-	     24c16, 24c32, 24c64, 24c128, 24c256, 24c512, 24c1024
+	    24c00, 24c01, 24c02, spd (readonly 24c02), 24c04, 24c08,
+	    24c16, 24c32, 24c64, 24c128, 24c256, 24c512, 24c1024
 
 	  Unless you like data loss puzzles, always be sure that any chip
 	  you configure as a 24c32 (32 kbit) or larger is NOT really a
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e8eeb6d4c3..89be6843ae 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -4,7 +4,7 @@ config GPIOLIB
 
 if GPIOLIB
 
-menu "GPIO                          "
+menu "GPIO"
 
 config GPIO_BCM2835
 	bool "GPIO support for BCM2835"
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 038e2ee454..0c6aec39c9 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -1,5 +1,5 @@
 menuconfig I2C
-	bool "I2C drivers                   "
+	bool "I2C drivers"
 
 if I2C
 
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 846483c794..a6f1f47f8d 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -13,7 +13,7 @@ config KEYBOARD_GPIO
 	  to GPIO pins of various CPUs (and some other chips).
 
 	  Say Y here if your device has buttons connected
-	  directly to such GPIO pins.  Your board-specific
+	  directly to such GPIO pins. Your board-specific
 	  setup logic must also provide a platform device,
 	  with configuration data saying which GPIOs are used.
 
@@ -26,7 +26,7 @@ config KEYBOARD_IMX_KEYPAD
 	  to the IMX keypad matrix.
 
 	  Say Y here if your device has buttons connected
-	  to the IMX keypad matrix.  Your board-specific
+	  to the IMX keypad matrix. Your board-specific
 	  setup logic must also provide a 'matrix_keymap_data' structure,
 	  defining the used keys.
 
diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig
index 5c0ca4dfa0..68761173c9 100644
--- a/drivers/mci/Kconfig
+++ b/drivers/mci/Kconfig
@@ -1,5 +1,5 @@
 menuconfig MCI
-	bool "MCI drivers                   "
+	bool "MCI drivers"
 	select DISK
 	help
 	  Add support for MCI drivers, used to handle MMC and SD cards
@@ -92,7 +92,7 @@ config MCI_SPI
 	depends on SPI
 	help
 	  Some systems access MMC/SD/SDIO cards using a SPI controller
-	  instead of using a "native" MMC/SD/SDIO controller.  This has a
+	  instead of using a "native" MMC/SD/SDIO controller. This has a
 	  disadvantage of being relatively high overhead, but a compensating
 	  advantage of working on many systems without dedicated MMC/SD/SDIO
 	  controllers.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 699046b0de..606490b54e 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -3,7 +3,7 @@
 #
 
 menuconfig MISC_DEVICES
-	bool "Misc devices                  "
+	bool "Misc devices"
 	help
 	  Add support for misc strange devices
 
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 0a4ca31bda..9450f5de8b 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -1,5 +1,5 @@
 menuconfig MTD
-        bool "Memory Technology Device (MTD) support"
+	bool "Memory Technology Device (MTD) support"
 
 if MTD
 
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 679ea80b73..61278a235d 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -15,7 +15,7 @@ config MTD_DATAFLASH_WRITE_VERIFY
 	help
 	  This adds an extra check when data is written to the flash.
 	  It may help if you are verifying chip setup (timings etc) on
-	  your board.  There is a rare possibility that even though the
+	  your board. There is a rare possibility that even though the
 	  device thinks the write was successful, a bit could have been
 	  flipped accidentally due to device wear or something else.
 
@@ -24,9 +24,9 @@ config MTD_M25P80
 	depends on SPI
 	help
 	  This enables access to most modern SPI flash chips, used for
-	  program and data storage.   Series supported include Atmel AT26DF,
-	  Spansion S25SL, SST 25VF, ST M25P, and Winbond W25X.  Other chips
-	  are supported as well.  See the driver source for the current list,
+	  program and data storage. Series supported include Atmel AT26DF,
+	  Spansion S25SL, SST 25VF, ST M25P, and Winbond W25X. Other chips
+	  are supported as well. See the driver source for the current list,
 	  or to add other chips.
 
 	  Note that the original DataFlash chips (AT45 series, not AT26DF),
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index d96ef9e813..49daabfb47 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,5 +1,5 @@
 menuconfig NAND
-	bool "NAND support              "
+	bool "NAND support"
 	select MTD_NAND_IDS
 	help
 	  This enables support for accessing all type of NAND flash
@@ -63,8 +63,8 @@ config NAND_OMAP_GPMC
 	tristate "NAND Flash Support for GPMC based OMAP platforms"
 	depends on OMAP_GPMC
 	help
-	 Support for NAND flash using GPMC. GPMC is a common memory
-	 interface found on Texas Instrument's OMAP platforms
+	  Support for NAND flash using GPMC. GPMC is a common memory
+	  interface found on Texas Instrument's OMAP platforms
 
 config NAND_ATMEL
 	bool
@@ -77,7 +77,7 @@ config NAND_ATMEL_PMECC
 	depends on NAND_ATMEL
 	select NAND_ECC_HW
 	help
-	 Support for PMECC present on the SoC sam9x5 and sam9n12
+	  Support for PMECC present on the SoC sam9x5 and sam9n12
 
 config NAND_S3C24XX
 	bool
@@ -104,7 +104,6 @@ config MTD_NAND_ECC_SMC
 
 config MTD_NAND_MUSEUM_IDS
 	bool "Enable chip ids for obsolete ancient NAND devices"
-	depends on MTD_NAND
 	default n
 	help
 	  Enable this option only when your board has first generation
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 2cf474ab59..6df954cbe8 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -1,5 +1,5 @@
 config UBI
-	bool "UBI support               "
+	bool "UBI support"
 	select PARTITION_NEED_MTD
 	select CRC32
 	help
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b3e5a83dc1..43d5984e0e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -22,7 +22,7 @@ config ARCH_HAS_FEC_IMX
 config PHYLIB
 	bool
 
-menu "Network drivers               "
+menu "Network drivers"
 	depends on NET
 
 source "drivers/net/phy/Kconfig"
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index c75d73dd0b..b6ac9ee750 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -2,7 +2,7 @@
 # PHY Layer Configuration
 #
 
-menu "phylib                       "
+menu "phylib"
 
 if PHYLIB
 
diff --git a/drivers/nor/Kconfig b/drivers/nor/Kconfig
index a3c0223164..c8ce24ff03 100644
--- a/drivers/nor/Kconfig
+++ b/drivers/nor/Kconfig
@@ -1,7 +1,7 @@
-menu "flash drivers                 "
+menu "flash drivers"
 
 menuconfig DRIVER_CFI
-	bool "CFI            "
+	bool "CFI"
 	help
 	  If you have NOR Flash devices connected to your system and wish
 	  to use them say yes here.
@@ -19,7 +19,7 @@ config DRIVER_CFI_AMD
 	bool "support AMD flash chips"
 
 config DRIVER_CFI_BANK_WIDTH_1
-	bool "Support  8-bit buswidth"
+	bool "Support 8-bit buswidth"
 	depends on DRIVER_CFI
 	default y
 	help
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 32b033fbec..a8be9cdc8d 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1,4 +1,4 @@
-menu "serial drivers                "
+menu "serial drivers"
 
 config DRIVER_SERIAL_ARM_DCC
 	depends on ARM
@@ -8,7 +8,7 @@ config SERIAL_AMBA_PL011
 	bool "ARM AMBA PL011 serial port support"
 	depends on ARM_AMBA
 	help
-	  This selects the ARM(R) AMBA(R) PrimeCell PL011 UART.  If you have
+	  This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have
 	  an Integrator/PP2, Integrator/CP or Versatile platform, say Y here.
 
 	  If unsure, say N.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index b00329096d..10b8fea7bd 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -1,4 +1,4 @@
-menu "SPI drivers                   "
+menu "SPI drivers"
 
 config SPI
 	bool "Enable SPI driver support"
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 254b196415..acdb4c6ad3 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -1,5 +1,5 @@
 menuconfig USB
-	bool "USB support                   "
+	bool "USB support"
 
 if USB
 
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 465121c337..6501d42873 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -1,6 +1,6 @@
 menuconfig USB_GADGET
 	depends on USB_HAVE_GADGET_DRIVER
-	bool "USB gadget support            "
+	bool "USB gadget support"
 
 config USB_HAVE_GADGET_DRIVER
 	bool
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 4aa92c5993..354e68b45c 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1,5 +1,5 @@
 menuconfig VIDEO
-	bool "Video drivers                 "
+	bool "Video drivers"
 	help
 	  Add support for framebuffer and splash screens
 
@@ -15,14 +15,14 @@ config IMXFB_DRIVER_VIDEO_IMX_OVERLAY
 
 config DRIVER_VIDEO_IMX_IPU
 	bool "i.MX31/35 framebuffer driver"
-	depends on ARCH_IMX35 || ARCH_IMX_31
+	depends on ARCH_IMX35 || ARCH_IMX31
 	help
 	  Add support for the IPU framebuffer device found on
 	  i.MX31 and i.MX35 CPUs.
 
 config DRIVER_VIDEO_IMX_IPU_OVERLAY
 	bool "i.MX31/35 framebuffer overlay support"
-	depends on DRIVER_VIDEO_IMX_IPU && (ARCH_IMX35 || ARCH_IMX_31)
+	depends on DRIVER_VIDEO_IMX_IPU && (ARCH_IMX35 || ARCH_IMX31)
 
 config DRIVER_VIDEO_STM
 	bool "i.MX23/28 framebuffer driver"
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index ba33617d22..2e2900c10f 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -3,7 +3,7 @@ config WATCHDOG_IMX_RESET_SOURCE
 	bool
 
 menuconfig WATCHDOG
-	bool "Watchdog support              "
+	bool "Watchdog support"
 	help
 	  Many platforms support a watchdog to keep track of a working machine.
 	  This framework provides routines to handle these watchdogs.