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:
@@ -8,8 +8,7 @@ menu "USB Network Adapters"
|
||||
depends on USB && NET
|
||||
|
||||
config USB_CATC
|
||||
tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
|
||||
depends on EXPERIMENTAL
|
||||
tristate "USB CATC NetMate-based Ethernet device support"
|
||||
select CRC32
|
||||
---help---
|
||||
Say Y if you want to use one of the following 10Mbps USB Ethernet
|
||||
@@ -83,8 +82,7 @@ config USB_PEGASUS
|
||||
module will be called pegasus.
|
||||
|
||||
config USB_RTL8150
|
||||
tristate "USB RTL8150 based ethernet device support (EXPERIMENTAL)"
|
||||
depends on EXPERIMENTAL
|
||||
tristate "USB RTL8150 based ethernet device support"
|
||||
select NET_CORE
|
||||
select MII
|
||||
help
|
||||
@@ -188,7 +186,7 @@ config USB_NET_CDCETHER
|
||||
|
||||
config USB_NET_CDC_EEM
|
||||
tristate "CDC EEM support"
|
||||
depends on USB_USBNET && EXPERIMENTAL
|
||||
depends on USB_USBNET
|
||||
help
|
||||
This option supports devices conforming to the Communication Device
|
||||
Class (CDC) Ethernet Emulation Model, a specification that's easy to
|
||||
@@ -287,7 +285,7 @@ config USB_NET_PLUSB
|
||||
tristate "Prolific PL-2301/2302/25A1 based cables"
|
||||
# if the handshake/init/reset problems, from original 'plusb',
|
||||
# are ever resolved ... then remove "experimental"
|
||||
depends on USB_USBNET && EXPERIMENTAL
|
||||
depends on USB_USBNET
|
||||
help
|
||||
Choose this option if you're using a host-to-host cable
|
||||
with one of these chips.
|
||||
@@ -301,8 +299,8 @@ config USB_NET_MCS7830
|
||||
adapters marketed under the DeLOCK brand.
|
||||
|
||||
config USB_NET_RNDIS_HOST
|
||||
tristate "Host for RNDIS and ActiveSync devices (EXPERIMENTAL)"
|
||||
depends on USB_USBNET && EXPERIMENTAL
|
||||
tristate "Host for RNDIS and ActiveSync devices"
|
||||
depends on USB_USBNET
|
||||
select USB_NET_CDCETHER
|
||||
help
|
||||
This option enables hosting "Remote NDIS" USB networking links,
|
||||
@@ -380,7 +378,7 @@ config USB_EPSON2888
|
||||
|
||||
config USB_KC2190
|
||||
boolean "KT Technology KC2190 based cables (InstaNet)"
|
||||
depends on USB_NET_CDC_SUBSET && EXPERIMENTAL
|
||||
depends on USB_NET_CDC_SUBSET
|
||||
help
|
||||
Choose this option if you're using a host-to-host cable
|
||||
with one of these chips.
|
||||
|
Reference in New Issue
Block a user