  	  Build the sonypi driver compatibility code into the sony-laptop driver.
  
  config THINKPAD_ACPI
-@@ -481,22 +481,22 @@
- 	default n
- 	select MMU_NOTIFIER
- 	---help---
--	The GRU is a hardware resource located in the system chipset. The GRU
--	contains memory that can be mmapped into the user address space. This memory is
--	used to communicate with the GRU to perform functions such as load/store,
--	scatter/gather, bcopy, AMOs, etc.  The GRU is directly accessed by user
--	instructions using user virtual addresses. GRU instructions (ex., bcopy) use
--	user virtual addresses for operands.
-+	  The GRU is a hardware resource located in the system chipset. The GRU
-+	  contains memory that can be mmapped into the user address space. This memory is
-+	  used to communicate with the GRU to perform functions such as load/store,
-+	  scatter/gather, bcopy, AMOs, etc.  The GRU is directly accessed by user
-+	  instructions using user virtual addresses. GRU instructions (ex., bcopy) use
-+	  user virtual addresses for operands.
- 
--	If you are not running on a SGI UV system, say N.
-+	  If you are not running on a SGI UV system, say N.
- 
- config SGI_GRU_DEBUG
- 	bool  "SGI GRU driver debug"
- 	depends on SGI_GRU
- 	default n
- 	---help---
--	This option enables addition debugging code for the SGI GRU driver. If
--	you are unsure, say N.
-+	  This option enables addition debugging code for the SGI GRU driver. If
-+	  you are unsure, say N.
- 
- source "drivers/misc/c2port/Kconfig"
- 
---- linux-2.6.28-gentoo/drivers/scsi/qla2xxx/Kconfig.orig	2009-01-26 13:32:47.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/scsi/qla2xxx/Kconfig	2009-01-26 13:33:15.000000000 +0800
-@@ -4,24 +4,24 @@
- 	select SCSI_FC_ATTRS
- 	select FW_LOADER
- 	---help---
--	This qla2xxx driver supports all QLogic Fibre Channel
--	PCI and PCIe host adapters.
-+	  This qla2xxx driver supports all QLogic Fibre Channel
-+	  PCI and PCIe host adapters.
- 
--	By default, firmware for the ISP parts will be loaded
--	via the Firmware Loader interface.
-+	  By default, firmware for the ISP parts will be loaded
-+	  via the Firmware Loader interface.
- 
--	ISP               Firmware Filename
--	----------        -----------------
--	21xx              ql2100_fw.bin
--	22xx              ql2200_fw.bin
--	2300, 2312, 6312  ql2300_fw.bin
--	2322, 6322        ql2322_fw.bin
--	24xx, 54xx        ql2400_fw.bin
--	25xx              ql2500_fw.bin
-+	  ISP               Firmware Filename
-+	  ----------        -----------------
-+	  21xx              ql2100_fw.bin
-+	  22xx              ql2200_fw.bin
-+	  2300, 2312, 6312  ql2300_fw.bin
-+	  2322, 6322        ql2322_fw.bin
-+	  24xx, 54xx        ql2400_fw.bin
-+	  25xx              ql2500_fw.bin
- 
--	Upon request, the driver caches the firmware image until
--	the driver is unloaded.
-+	  Upon request, the driver caches the firmware image until
-+	  the driver is unloaded.
- 
--	Firmware images can be retrieved from:
-+	  Firmware images can be retrieved from:
- 
--		ftp://ftp.qlogic.com/outgoing/linux/firmware/
-+	  	ftp://ftp.qlogic.com/outgoing/linux/firmware/
---- linux-2.6.28-gentoo/drivers/scsi/qla4xxx/Kconfig.orig	2009-01-26 13:33:30.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/scsi/qla4xxx/Kconfig	2009-01-26 13:33:39.000000000 +0800
-@@ -3,5 +3,5 @@
- 	depends on PCI && SCSI && NET
- 	select SCSI_ISCSI_ATTRS
- 	---help---
--	This driver supports the QLogic 40xx (ISP4XXX) iSCSI host
--	adapter family.
-+	  This driver supports the QLogic 40xx (ISP4XXX) iSCSI host
-+	  adapter family.
---- linux-2.6.28-gentoo/drivers/scsi/device_handler/Kconfig.orig	2009-01-26 13:33:51.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/scsi/device_handler/Kconfig	2009-01-26 13:34:07.000000000 +0800
-@@ -15,21 +15,21 @@
- 	tristate "LSI RDAC Device Handler"
- 	depends on SCSI_DH
- 	help
--	If you have a LSI RDAC select y. Otherwise, say N.
-+	  If you have a LSI RDAC select y. Otherwise, say N.
- 
- config SCSI_DH_HP_SW
- 	tristate "HP/COMPAQ MSA Device Handler"
- 	depends on SCSI_DH
- 	help
--	If you have a HP/COMPAQ MSA device that requires START_STOP to
--	be sent to start it and cannot upgrade the firmware then select y.
--	Otherwise, say N.
-+	  If you have a HP/COMPAQ MSA device that requires START_STOP to
-+	  be sent to start it and cannot upgrade the firmware then select y.
-+	  Otherwise, say N.
- 
- config SCSI_DH_EMC
- 	tristate "EMC CLARiiON Device Handler"
- 	depends on SCSI_DH
- 	help
--	If you have a EMC CLARiiON select y. Otherwise, say N.
-+	  If you have a EMC CLARiiON select y. Otherwise, say N.
- 
- config SCSI_DH_ALUA
- 	tristate "SPC-3 ALUA Device Handler (EXPERIMENTAL)"
---- linux-2.6.28-gentoo/drivers/scsi/aic7xxx/Kconfig.aic79xx.orig	2009-01-26 13:30:12.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/scsi/aic7xxx/Kconfig.aic79xx	2009-01-26 13:31:04.000000000 +0800
-@@ -7,80 +7,80 @@
- 	depends on PCI && SCSI
- 	select SCSI_SPI_ATTRS
- 	help
--	This driver supports all of Adaptec's Ultra 320 PCI-X
--	based SCSI controllers.
-+	  This driver supports all of Adaptec's Ultra 320 PCI-X
-+	  based SCSI controllers.
- 
- config AIC79XX_CMDS_PER_DEVICE
- 	int "Maximum number of TCQ commands per device"
- 	depends on SCSI_AIC79XX
- 	default "32"
- 	---help---
--	Specify the number of commands you would like to allocate per SCSI
--	device when Tagged Command Queueing (TCQ) is enabled on that device.
-+	  Specify the number of commands you would like to allocate per SCSI
-+	  device when Tagged Command Queueing (TCQ) is enabled on that device.
- 
--	This is an upper bound value for the number of tagged transactions
--	to be used for any device.  The aic7xxx driver will automatically
--	vary this number based on device behavior.  For devices with a
--	fixed maximum, the driver will eventually lock to this maximum
--	and display a console message indicating this value.
--
--	Due to resource allocation issues in the Linux SCSI mid-layer, using
--	a high number of commands per device may result in memory allocation
--	failures when many devices are attached to the system.  For this reason,
--	the default is set to 32.  Higher values may result in higher performance
--	on some devices.  The upper bound is 253.  0 disables tagged queueing.
--
--	Per device tag depth can be controlled via the kernel command line
--	"tag_info" option.  See drivers/scsi/aic7xxx/README.aic79xx
--	for details.
-+	  This is an upper bound value for the number of tagged transactions
-+	  to be used for any device.  The aic7xxx driver will automatically
-+	  vary this number based on device behavior.  For devices with a
-+	  fixed maximum, the driver will eventually lock to this maximum
-+	  and display a console message indicating this value.
-+
-+	  Due to resource allocation issues in the Linux SCSI mid-layer, using
-+	  a high number of commands per device may result in memory allocation
-+	  failures when many devices are attached to the system.  For this reason,
-+	  the default is set to 32.  Higher values may result in higher performance
-+	  on some devices.  The upper bound is 253.  0 disables tagged queueing.
-+
-+	  Per device tag depth can be controlled via the kernel command line
-+	  "tag_info" option.  See drivers/scsi/aic7xxx/README.aic79xx
-+	  for details.
- 
- config AIC79XX_RESET_DELAY_MS
- 	int "Initial bus reset delay in milli-seconds"
- 	depends on SCSI_AIC79XX
- 	default "5000"
- 	---help---
--	The number of milliseconds to delay after an initial bus reset.
--	The bus settle delay following all error recovery actions is
--	dictated by the SCSI layer and is not affected by this value.
-+	  The number of milliseconds to delay after an initial bus reset.
-+	  The bus settle delay following all error recovery actions is
-+	  dictated by the SCSI layer and is not affected by this value.
- 
--	Default: 5000 (5 seconds)
-+	  Default: 5000 (5 seconds)
- 
- config AIC79XX_BUILD_FIRMWARE
- 	bool "Build Adapter Firmware with Kernel Build"
- 	depends on SCSI_AIC79XX && !PREVENT_FIRMWARE_BUILD
- 	help
--	This option should only be enabled if you are modifying the firmware
--	source to the aic79xx driver and wish to have the generated firmware
--	include files updated during a normal kernel build.  The assembler
--	for the firmware requires lex and yacc or their equivalents, as well
--	as the db v1 library.  You may have to install additional packages
--	or modify the assembler Makefile or the files it includes if your
--	build environment is different than that of the author.
-+	  This option should only be enabled if you are modifying the firmware
-+	  source to the aic79xx driver and wish to have the generated firmware
-+	  include files updated during a normal kernel build.  The assembler
-+	  for the firmware requires lex and yacc or their equivalents, as well
-+	  as the db v1 library.  You may have to install additional packages
-+	  or modify the assembler Makefile or the files it includes if your
-+	  build environment is different than that of the author.
- 
- config AIC79XX_DEBUG_ENABLE
- 	bool "Compile in Debugging Code"
- 	depends on SCSI_AIC79XX
- 	default y
- 	help
--	Compile in aic79xx debugging code that can be useful in diagnosing
--	driver errors.
-+	  Compile in aic79xx debugging code that can be useful in diagnosing
-+	  driver errors.
- 
- config AIC79XX_DEBUG_MASK
- 	int "Debug code enable mask (16383 for all debugging)"
- 	depends on SCSI_AIC79XX
- 	default "0"
- 	help
--	Bit mask of debug options that is only valid if the
--	CONFIG_AIC79XX_DEBUG_ENBLE option is enabled.  The bits in this mask
--	are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the
--	variable ahd_debug in that file to find them.
-+	  Bit mask of debug options that is only valid if the
-+	  CONFIG_AIC79XX_DEBUG_ENBLE option is enabled.  The bits in this mask
-+	  are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the
-+	  variable ahd_debug in that file to find them.
- 
- config AIC79XX_REG_PRETTY_PRINT
- 	bool "Decode registers during diagnostics"
- 	depends on SCSI_AIC79XX
- 	default y
- 	help
--	Compile in register value tables for the output of expanded register
--	contents in diagnostics.  This make it much easier to understand debug
--	output without having to refer to a data book and/or the aic7xxx.reg
--	file.
-+	  Compile in register value tables for the output of expanded register
-+	  contents in diagnostics.  This make it much easier to understand debug
-+	  output without having to refer to a data book and/or the aic7xxx.reg
-+	  file.
---- linux-2.6.28-gentoo/drivers/scsi/aic7xxx/Kconfig.aic7xxx.orig	2009-01-26 13:28:50.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/scsi/aic7xxx/Kconfig.aic7xxx	2009-01-26 13:29:55.000000000 +0800
-@@ -7,85 +7,85 @@
- 	depends on (PCI || EISA) && SCSI
- 	select SCSI_SPI_ATTRS
- 	---help---
--	This driver supports all of Adaptec's Fast through Ultra 160 PCI
--	based SCSI controllers as well as the aic7770 based EISA and VLB
--	SCSI controllers (the 274x and 284x series).  For AAA and ARO based
--	configurations, only SCSI functionality is provided.
-+	  This driver supports all of Adaptec's Fast through Ultra 160 PCI
-+	  based SCSI controllers as well as the aic7770 based EISA and VLB
-+	  SCSI controllers (the 274x and 284x series).  For AAA and ARO based
-+	  configurations, only SCSI functionality is provided.
- 
--	To compile this driver as a module, choose M here: the
--	module will be called aic7xxx.
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called aic7xxx.
- 
- config AIC7XXX_CMDS_PER_DEVICE
- 	int "Maximum number of TCQ commands per device"
- 	depends on SCSI_AIC7XXX
- 	default "32"
- 	---help---
--	Specify the number of commands you would like to allocate per SCSI
--	device when Tagged Command Queueing (TCQ) is enabled on that device.
-+	  Specify the number of commands you would like to allocate per SCSI
-+	  device when Tagged Command Queueing (TCQ) is enabled on that device.
- 
--	This is an upper bound value for the number of tagged transactions
--	to be used for any device.  The aic7xxx driver will automatically
--	vary this number based on device behavior.  For devices with a
--	fixed maximum, the driver will eventually lock to this maximum
--	and display a console message indicating this value.
--
--	Due to resource allocation issues in the Linux SCSI mid-layer, using
--	a high number of commands per device may result in memory allocation
--	failures when many devices are attached to the system.  For this reason,
--	the default is set to 32.  Higher values may result in higher performance
--	on some devices.  The upper bound is 253.  0 disables tagged queueing.
--
--	Per device tag depth can be controlled via the kernel command line
--	"tag_info" option.  See drivers/scsi/aic7xxx/README.aic7xxx
--	for details.
-+	  This is an upper bound value for the number of tagged transactions
-+	  to be used for any device.  The aic7xxx driver will automatically
-+	  vary this number based on device behavior.  For devices with a
-+	  fixed maximum, the driver will eventually lock to this maximum
-+	  and display a console message indicating this value.
-+
-+	  Due to resource allocation issues in the Linux SCSI mid-layer, using
-+	  a high number of commands per device may result in memory allocation
-+	  failures when many devices are attached to the system.  For this reason,
-+	  the default is set to 32.  Higher values may result in higher performance
-+	  on some devices.  The upper bound is 253.  0 disables tagged queueing.
-+
-+	  Per device tag depth can be controlled via the kernel command line
-+	  "tag_info" option.  See drivers/scsi/aic7xxx/README.aic7xxx
-+	  for details.
- 
- config AIC7XXX_RESET_DELAY_MS
- 	int "Initial bus reset delay in milli-seconds"
- 	depends on SCSI_AIC7XXX
- 	default "5000"
- 	---help---
--	The number of milliseconds to delay after an initial bus reset.
--	The bus settle delay following all error recovery actions is
--	dictated by the SCSI layer and is not affected by this value.
-+	  The number of milliseconds to delay after an initial bus reset.
-+	  The bus settle delay following all error recovery actions is
-+	  dictated by the SCSI layer and is not affected by this value.
- 
--	Default: 5000 (5 seconds)
-+	  Default: 5000 (5 seconds)
- 
- config AIC7XXX_BUILD_FIRMWARE
- 	bool "Build Adapter Firmware with Kernel Build"
- 	depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD
- 	help
--	This option should only be enabled if you are modifying the firmware
--	source to the aic7xxx driver and wish to have the generated firmware
--	include files updated during a normal kernel build.  The assembler
--	for the firmware requires lex and yacc or their equivalents, as well
--	as the db v1 library.  You may have to install additional packages
--	or modify the assembler Makefile or the files it includes if your
--	build environment is different than that of the author.
-+	  This option should only be enabled if you are modifying the firmware
-+	  source to the aic7xxx driver and wish to have the generated firmware
-+	  include files updated during a normal kernel build.  The assembler
-+	  for the firmware requires lex and yacc or their equivalents, as well
-+	  as the db v1 library.  You may have to install additional packages
-+	  or modify the assembler Makefile or the files it includes if your
-+	  build environment is different than that of the author.
- 
- config AIC7XXX_DEBUG_ENABLE
- 	bool "Compile in Debugging Code"
- 	depends on SCSI_AIC7XXX
- 	default y
- 	help
--	Compile in aic7xxx debugging code that can be useful in diagnosing
--	driver errors.
-+	  Compile in aic7xxx debugging code that can be useful in diagnosing
-+	  driver errors.
- 
- config AIC7XXX_DEBUG_MASK
-         int "Debug code enable mask (2047 for all debugging)"
-         depends on SCSI_AIC7XXX
-         default "0"
-         help
--	Bit mask of debug options that is only valid if the
--	CONFIG_AIC7XXX_DEBUG_ENABLE option is enabled.  The bits in this mask
--	are defined in the drivers/scsi/aic7xxx/aic7xxx.h - search for the
--	variable ahc_debug in that file to find them.
-+	  Bit mask of debug options that is only valid if the
-+	  CONFIG_AIC7XXX_DEBUG_ENABLE option is enabled.  The bits in this mask
-+	  are defined in the drivers/scsi/aic7xxx/aic7xxx.h - search for the
-+	  variable ahc_debug in that file to find them.
- 
- config AIC7XXX_REG_PRETTY_PRINT
-         bool "Decode registers during diagnostics"
-         depends on SCSI_AIC7XXX
- 	default y
-         help
--	Compile in register value tables for the output of expanded register
--	contents in diagnostics.  This make it much easier to understand debug
--	output without having to refer to a data book and/or the aic7xxx.reg
--	file.
-+	  Compile in register value tables for the output of expanded register
-+	  contents in diagnostics.  This make it much easier to understand debug
-+	  output without having to refer to a data book and/or the aic7xxx.reg
-+	  file.
---- linux-2.6.28-gentoo/drivers/scsi/megaraid/Kconfig.megaraid.orig	2009-01-26 13:31:23.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/scsi/megaraid/Kconfig.megaraid	2009-01-26 13:32:29.000000000 +0800
-@@ -2,84 +2,84 @@
- 	bool "LSI Logic New Generation RAID Device Drivers"
- 	depends on PCI && SCSI
- 	help
--	LSI Logic RAID Device Drivers
-+	  LSI Logic RAID Device Drivers
- 
- config MEGARAID_MM
- 	tristate "LSI Logic Management Module (New Driver)"
- 	depends on PCI && SCSI && MEGARAID_NEWGEN
- 	help
--	Management Module provides ioctl, sysfs support for LSI Logic
--	RAID controllers.
--	To compile this driver as a module, choose M here: the
--	module will be called megaraid_mm
-+	  Management Module provides ioctl, sysfs support for LSI Logic
-+	  RAID controllers.
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called megaraid_mm
- 
- 
- config MEGARAID_MAILBOX
- 	tristate "LSI Logic MegaRAID Driver (New Driver)"
- 	depends on PCI && SCSI && MEGARAID_MM
- 	help
--	List of supported controllers
-+	  List of supported controllers
- 
--	OEM	Product Name		VID :DID :SVID:SSID
--	---	------------		---- ---- ---- ----
--	Dell PERC3/QC			101E:1960:1028:0471
--	Dell PERC3/DC			101E:1960:1028:0493
--	Dell PERC3/SC			101E:1960:1028:0475
--	Dell PERC3/Di			1028:000E:1028:0123
--	Dell PERC4/SC			1000:1960:1028:0520
--	Dell PERC4/DC			1000:1960:1028:0518
--	Dell PERC4/QC			1000:0407:1028:0531
--	Dell PERC4/Di			1028:000F:1028:014A
--	Dell PERC 4e/Si			1028:0013:1028:016c
--	Dell PERC 4e/Di			1028:0013:1028:016d
--	Dell PERC 4e/Di			1028:0013:1028:016e
--	Dell PERC 4e/Di			1028:0013:1028:016f
--	Dell PERC 4e/Di			1028:0013:1028:0170
--	Dell PERC 4e/DC			1000:0408:1028:0002
--	Dell PERC 4e/SC			1000:0408:1028:0001
--	LSI MegaRAID SCSI 320-0		1000:1960:1000:A520
--	LSI MegaRAID SCSI 320-1		1000:1960:1000:0520
--	LSI MegaRAID SCSI 320-2		1000:1960:1000:0518
--	LSI MegaRAID SCSI 320-0X	1000:0407:1000:0530
--	LSI MegaRAID SCSI 320-2X	1000:0407:1000:0532
--	LSI MegaRAID SCSI 320-4X	1000:0407:1000:0531
--	LSI MegaRAID SCSI 320-1E	1000:0408:1000:0001
--	LSI MegaRAID SCSI 320-2E	1000:0408:1000:0002
--	LSI MegaRAID SATA 150-4		1000:1960:1000:4523
--	LSI MegaRAID SATA 150-6		1000:1960:1000:0523
--	LSI MegaRAID SATA 300-4X	1000:0409:1000:3004
--	LSI MegaRAID SATA 300-8X	1000:0409:1000:3008
--	INTEL RAID Controller SRCU42X	1000:0407:8086:0532
--	INTEL RAID Controller SRCS16	1000:1960:8086:0523
--	INTEL RAID Controller SRCU42E	1000:0408:8086:0002
--	INTEL RAID Controller SRCZCRX	1000:0407:8086:0530
--	INTEL RAID Controller SRCS28X	1000:0409:8086:3008
--	INTEL RAID Controller SROMBU42E	1000:0408:8086:3431
--	INTEL RAID Controller SROMBU42E	1000:0408:8086:3499
--	INTEL RAID Controller SRCU51L	1000:1960:8086:0520
--	FSC MegaRAID PCI Express ROMB	1000:0408:1734:1065
--	ACER MegaRAID ROMB-2E		1000:0408:1025:004D
--	NEC MegaRAID PCI Express ROMB	1000:0408:1033:8287
-+	  OEM	Product Name		VID :DID :SVID:SSID
-+	  ---	------------		---- ---- ---- ----
-+	  Dell PERC3/QC			101E:1960:1028:0471
-+	  Dell PERC3/DC			101E:1960:1028:0493
-+	  Dell PERC3/SC			101E:1960:1028:0475
-+	  Dell PERC3/Di			1028:000E:1028:0123
-+	  Dell PERC4/SC			1000:1960:1028:0520
-+	  Dell PERC4/DC			1000:1960:1028:0518
-+	  Dell PERC4/QC			1000:0407:1028:0531
-+	  Dell PERC4/Di			1028:000F:1028:014A
-+	  Dell PERC 4e/Si			1028:0013:1028:016c
-+	  Dell PERC 4e/Di			1028:0013:1028:016d
-+	  Dell PERC 4e/Di			1028:0013:1028:016e
-+	  Dell PERC 4e/Di			1028:0013:1028:016f
-+	  Dell PERC 4e/Di			1028:0013:1028:0170
-+	  Dell PERC 4e/DC			1000:0408:1028:0002
-+	  Dell PERC 4e/SC			1000:0408:1028:0001
-+	  LSI MegaRAID SCSI 320-0		1000:1960:1000:A520
-+	  LSI MegaRAID SCSI 320-1		1000:1960:1000:0520
-+	  LSI MegaRAID SCSI 320-2		1000:1960:1000:0518
-+	  LSI MegaRAID SCSI 320-0X	1000:0407:1000:0530
-+	  LSI MegaRAID SCSI 320-2X	1000:0407:1000:0532
-+	  LSI MegaRAID SCSI 320-4X	1000:0407:1000:0531
-+	  LSI MegaRAID SCSI 320-1E	1000:0408:1000:0001
-+	  LSI MegaRAID SCSI 320-2E	1000:0408:1000:0002
-+	  LSI MegaRAID SATA 150-4		1000:1960:1000:4523
-+	  LSI MegaRAID SATA 150-6		1000:1960:1000:0523
-+	  LSI MegaRAID SATA 300-4X	1000:0409:1000:3004
-+	  LSI MegaRAID SATA 300-8X	1000:0409:1000:3008
-+	  INTEL RAID Controller SRCU42X	1000:0407:8086:0532
-+	  INTEL RAID Controller SRCS16	1000:1960:8086:0523
-+	  INTEL RAID Controller SRCU42E	1000:0408:8086:0002
-+	  INTEL RAID Controller SRCZCRX	1000:0407:8086:0530
-+	  INTEL RAID Controller SRCS28X	1000:0409:8086:3008
-+	  INTEL RAID Controller SROMBU42E	1000:0408:8086:3431
-+	  INTEL RAID Controller SROMBU42E	1000:0408:8086:3499
-+	  INTEL RAID Controller SRCU51L	1000:1960:8086:0520
-+	  FSC MegaRAID PCI Express ROMB	1000:0408:1734:1065
-+	  ACER MegaRAID ROMB-2E		1000:0408:1025:004D
-+	  NEC MegaRAID PCI Express ROMB	1000:0408:1033:8287
- 
--	To compile this driver as a module, choose M here: the
--	module will be called megaraid_mbox
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called megaraid_mbox
- 
- config MEGARAID_LEGACY
- 	tristate "LSI Logic Legacy MegaRAID Driver"
- 	depends on PCI && SCSI
- 	help
--	This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490
--	and 467 SCSI host adapters. This driver also support the all U320
--	RAID controllers
-+	  This driver supports the LSI MegaRAID 418, 428, 438, 466, 762, 490
-+	  and 467 SCSI host adapters. This driver also support the all U320
-+	  RAID controllers
- 
--	To compile this driver as a module, choose M here: the
--	module will be called megaraid
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called megaraid
- 
- config MEGARAID_SAS
- 	tristate "LSI Logic MegaRAID SAS RAID Module"
- 	depends on PCI && SCSI
- 	help
--	Module for LSI Logic's SAS based RAID controllers.
--	To compile this driver as a module, choose 'm' here.
--	Module will be called megaraid_sas
-+	  Module for LSI Logic's SAS based RAID controllers.
-+	  To compile this driver as a module, choose 'm' here.
-+	  Module will be called megaraid_sas
- 
---- linux-2.6.28-gentoo/drivers/infiniband/hw/ehca/Kconfig.orig	2009-01-26 14:01:16.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/infiniband/hw/ehca/Kconfig	2009-01-26 14:01:23.000000000 +0800
-@@ -2,8 +2,8 @@
- 	tristate "eHCA support"
- 	depends on IBMEBUS
- 	---help---
--	This driver supports the IBM pSeries eHCA InfiniBand adapter.
-+	  This driver supports the IBM pSeries eHCA InfiniBand adapter.
- 
--	To compile the driver as a module, choose M here. The module
--	will be called ib_ehca.
-+	  To compile the driver as a module, choose M here. The module
-+	  will be called ib_ehca.
- 
---- linux-2.6.28-gentoo/drivers/infiniband/hw/ipath/Kconfig.orig	2009-01-26 14:00:56.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/infiniband/hw/ipath/Kconfig	2009-01-26 14:01:04.000000000 +0800
-@@ -2,8 +2,8 @@
- 	tristate "QLogic InfiniPath Driver"
- 	depends on 64BIT && NET
- 	---help---
--	This is a driver for QLogic InfiniPath host channel adapters,
--	including InfiniBand verbs support.  This driver allows these
--	devices to be used with both kernel upper level protocols such
--	as IP-over-InfiniBand as well as with userspace applications
--	(in conjunction with InfiniBand userspace access).
-+	  This is a driver for QLogic InfiniPath host channel adapters,
-+	  including InfiniBand verbs support.  This driver allows these
-+	  devices to be used with both kernel upper level protocols such
-+	  as IP-over-InfiniBand as well as with userspace applications
-+	  (in conjunction with InfiniBand userspace access).
---- linux-2.6.28-gentoo/drivers/block/Kconfig.orig	2009-01-26 13:26:24.000000000 +0800
-+++ linux-2.6.28-gentoo/drivers/block/Kconfig	2009-01-26 13:26:35.000000000 +0800
-@@ -400,8 +400,8 @@
- 	tristate "ATA over Ethernet support"
- 	depends on NET
- 	help
--	This driver provides Support for ATA over Ethernet block
--	devices like the Coraid EtherDrive (R) Storage Blade.
-+	  This driver provides Support for ATA over Ethernet block
-+	  devices like the Coraid EtherDrive (R) Storage Blade.
- 
- config SUNVDC
- 	tristate "Sun Virtual Disk Client support"
 --- linux-2.6.28-gentoo/drivers/hwmon/Kconfig.orig	2009-01-26 13:49:30.000000000 +0800
 +++ linux-2.6.28-gentoo/drivers/hwmon/Kconfig	2009-01-26 13:49:44.000000000 +0800
 @@ -294,7 +294,7 @@

 
 config FB_LE80578
 	tristate "Intel LE80578 (Vermilion) support"
@@ -1565,8 +1563,8 @@
 	bool "3Dfx Acceleration functions (EXPERIMENTAL)"
 	depends on FB_3DFX && EXPERIMENTAL
 	---help---
-	This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer
-	device driver with acceleration functions.
+	  This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer
+	  device driver with acceleration functions.
 
 config FB_VOODOO1
 	tristate "3Dfx Voodoo Graphics (sst1) support"
@@ -1648,8 +1646,8 @@
 	bool "Trident Acceleration functions (EXPERIMENTAL)"
 	depends on FB_TRIDENT && EXPERIMENTAL
 	---help---
-	This will compile the Trident frame buffer device with
-	acceleration functions.
+	  This will compile the Trident frame buffer device with
+	  acceleration functions.
 
 config FB_ARK
 	tristate "ARK 2000PV support"
@@ -2120,11 +2118,11 @@
 source "drivers/video/display/Kconfig"
 

 
 config DVB_STV0299
--- linux-2.6.28-gentoo/drivers/video/Kconfig.orig	2009-01-26 13:54:02.000000000 +0800
+++ linux-2.6.28-gentoo/drivers/video/Kconfig	2009-01-26 18:18:31.000000000 +0800
@@ -298,7 +298,6 @@
 	  will be called amba-clcd.
 
