Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman: "Here is the big driver core merge for 3.9-rc1 There are two major series here, both of which touch lots of drivers all over the kernel, and will cause you some merge conflicts: - add a new function called devm_ioremap_resource() to properly be able to check return values. - remove CONFIG_EXPERIMENTAL Other than those patches, there's not much here, some minor fixes and updates" Fix up trivial conflicts * tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits) base: memory: fix soft/hard_offline_page permissions drivercore: Fix ordering between deferred_probe and exiting initcalls backlight: fix class_find_device() arguments TTY: mark tty_get_device call with the proper const values driver-core: constify data for class_find_device() firmware: Ignore abort check when no user-helper is used firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER firmware: Make user-mode helper optional firmware: Refactoring for splitting user-mode helper code Driver core: treat unregistered bus_types as having no devices watchdog: Convert to devm_ioremap_resource() thermal: Convert to devm_ioremap_resource() spi: Convert to devm_ioremap_resource() power: Convert to devm_ioremap_resource() mtd: Convert to devm_ioremap_resource() mmc: Convert to devm_ioremap_resource() mfd: Convert to devm_ioremap_resource() media: Convert to devm_ioremap_resource() iommu: Convert to devm_ioremap_resource() drm: Convert to devm_ioremap_resource() ...
This commit is contained in:
@@ -88,7 +88,7 @@ config SPI_BFIN_SPORT
|
||||
|
||||
config SPI_AU1550
|
||||
tristate "Au1550/Au1200/Au1300 SPI Controller"
|
||||
depends on MIPS_ALCHEMY && EXPERIMENTAL
|
||||
depends on MIPS_ALCHEMY
|
||||
select SPI_BITBANG
|
||||
help
|
||||
If you say yes to this option, support will be included for the
|
||||
@@ -188,7 +188,7 @@ config SPI_IMX
|
||||
|
||||
config SPI_LM70_LLP
|
||||
tristate "Parallel port adapter for LM70 eval board (DEVELOPMENT)"
|
||||
depends on PARPORT && EXPERIMENTAL
|
||||
depends on PARPORT
|
||||
select SPI_BITBANG
|
||||
help
|
||||
This driver supports the NS LM70 LLP Evaluation Board,
|
||||
@@ -204,7 +204,7 @@ config SPI_MPC52xx
|
||||
|
||||
config SPI_MPC52xx_PSC
|
||||
tristate "Freescale MPC52xx PSC SPI controller"
|
||||
depends on PPC_MPC52xx && EXPERIMENTAL
|
||||
depends on PPC_MPC52xx
|
||||
help
|
||||
This enables using the Freescale MPC52xx Programmable Serial
|
||||
Controller in master SPI mode.
|
||||
@@ -273,8 +273,8 @@ config SPI_OMAP_100K
|
||||
OMAP SPI 100K master controller for omap7xx boards.
|
||||
|
||||
config SPI_ORION
|
||||
tristate "Orion SPI master (EXPERIMENTAL)"
|
||||
depends on PLAT_ORION && EXPERIMENTAL
|
||||
tristate "Orion SPI master"
|
||||
depends on PLAT_ORION
|
||||
help
|
||||
This enables using the SPI master controller on the Orion chips.
|
||||
|
||||
@@ -328,7 +328,7 @@ config SPI_RSPI
|
||||
|
||||
config SPI_S3C24XX
|
||||
tristate "Samsung S3C24XX series SPI"
|
||||
depends on ARCH_S3C24XX && EXPERIMENTAL
|
||||
depends on ARCH_S3C24XX
|
||||
select SPI_BITBANG
|
||||
help
|
||||
SPI driver for Samsung S3C24XX series ARM SoCs
|
||||
@@ -443,7 +443,7 @@ config SPI_XCOMM
|
||||
|
||||
config SPI_XILINX
|
||||
tristate "Xilinx SPI controller common module"
|
||||
depends on HAS_IOMEM && EXPERIMENTAL
|
||||
depends on HAS_IOMEM
|
||||
select SPI_BITBANG
|
||||
help
|
||||
This exposes the SPI controller IP from the Xilinx EDK.
|
||||
@@ -455,7 +455,7 @@ config SPI_XILINX
|
||||
|
||||
config SPI_NUC900
|
||||
tristate "Nuvoton NUC900 series SPI"
|
||||
depends on ARCH_W90X900 && EXPERIMENTAL
|
||||
depends on ARCH_W90X900
|
||||
select SPI_BITBANG
|
||||
help
|
||||
SPI driver for Nuvoton NUC900 series ARM SoCs
|
||||
@@ -489,7 +489,6 @@ comment "SPI Protocol Masters"
|
||||
|
||||
config SPI_SPIDEV
|
||||
tristate "User mode SPI device driver support"
|
||||
depends on EXPERIMENTAL
|
||||
help
|
||||
This supports user mode SPI protocol drivers.
|
||||
|
||||
|
Referens i nytt ärende
Block a user