xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Browse Source 
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:
Linus Torvalds
2013-02-21 12:05:51 -08:00
parent 460dc1eecf 74fef7a8fd
commit 06991c28f3
378 changed files with 1711 additions and 1905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/8390/Kconfig
View File

@@ -5,10 +5,7 @@
config NET_VENDOR_8390
bool "National Semi-conductor 8390 devices"
default y
depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
ISA || MAC || M32R || MACH_TX49XX || \
H8300 || ARM || MIPS || ZORRO || PCMCIA || \
EXPERIMENTAL)
depends on NET_VENDOR_NATSEMI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from

8
drivers/net/ethernet/atheros/Kconfig
View File

@@ -44,8 +44,8 @@ config ATL1
will be called atl1.
config ATL1E
tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL
tristate "Atheros L1E Gigabit Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
@@ -56,8 +56,8 @@ config ATL1E
will be called atl1e.
config ATL1C
tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL
tristate "Atheros L1C Gigabit Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII

4
drivers/net/ethernet/dec/tulip/Kconfig
View File

@@ -57,8 +57,8 @@ config TULIP
be called tulip.
config TULIP_MWI
bool "New bus configuration (EXPERIMENTAL)"
depends on TULIP && EXPERIMENTAL
bool "New bus configuration"
depends on TULIP
---help---
This configures your Tulip card specifically for the card and
system cache line size type you are using.

2
drivers/net/ethernet/fujitsu/Kconfig
View File

@@ -5,7 +5,7 @@
config NET_VENDOR_FUJITSU
bool "Fujitsu devices"
default y
depends on ISA || PCMCIA || (ISA && EXPERIMENTAL)
depends on ISA || PCMCIA
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from

4
drivers/net/ethernet/i825xx/Kconfig
View File

@@ -5,9 +5,7 @@
config NET_VENDOR_I825XX
bool "Intel (82586/82593/82596) devices"
default y
depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
ARCH_ACORN || SNI_RM || SUN3 || \
GSC || BVME6000 || MVME16x || EXPERIMENTAL)
depends on NET_VENDOR_INTEL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from

2
drivers/net/ethernet/icplus/Kconfig
View File

@@ -4,7 +4,7 @@
config IP1000
tristate "IP1000 Gigabit Ethernet support"
depends on PCI && EXPERIMENTAL
depends on PCI
select NET_CORE
select MII
---help---

5
drivers/net/ethernet/intel/Kconfig
View File

@@ -5,11 +5,6 @@
config NET_VENDOR_INTEL
bool "Intel devices"
default y
depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \
ARCH_ACORN || SNI_RM || SUN3 || \
GSC || BVME6000 || MVME16x || \
(ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \
EXPERIMENTAL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from

4
drivers/net/ethernet/microchip/Kconfig
View File

@@ -5,7 +5,7 @@
config NET_VENDOR_MICROCHIP
bool "Microchip devices"
default y
depends on SPI && EXPERIMENTAL
depends on SPI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
@@ -20,7 +20,7 @@ if NET_VENDOR_MICROCHIP
config ENC28J60
tristate "ENC28J60 support"
depends on SPI && EXPERIMENTAL
depends on SPI
select CRC32
---help---
Support for the Microchip EN28J60 ethernet chip.

3
drivers/net/ethernet/natsemi/Kconfig
View File

@@ -5,9 +5,6 @@
config NET_VENDOR_NATSEMI
bool "National Semi-conductor devices"
default y
depends on AMIGA_PCMCIA || ARM || EISA || EXPERIMENTAL || H8300 || \
ISA || M32R || MAC || MACH_JAZZ || MACH_TX49XX || MIPS || \
PCI || PCMCIA || SUPERH || XTENSA_PLATFORM_XT2000 || ZORRO
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from

4
drivers/net/ethernet/packetengines/Kconfig
View File

@@ -32,8 +32,8 @@ config HAMACHI
called hamachi.
config YELLOWFIN
tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL
tristate "Packet Engines Yellowfin Gigabit-NIC support"
depends on PCI
select CRC32
---help---
Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet

4
drivers/net/ethernet/realtek/Kconfig
View File

@@ -34,8 +34,8 @@ config ATP
will be called atp.
config 8139CP
tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL
tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support"
depends on PCI
select CRC32
select NET_CORE
select MII

1
drivers/net/ethernet/seeq/Kconfig
View File

@@ -6,7 +6,6 @@ config NET_VENDOR_SEEQ
bool "SEEQ devices"
default y
depends on HAS_IOMEM
depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from

6
drivers/net/ethernet/silan/Kconfig
View File

@@ -5,7 +5,7 @@
config NET_VENDOR_SILAN
bool "Silan devices"
default y
depends on PCI && EXPERIMENTAL
depends on PCI
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
@@ -19,8 +19,8 @@ config NET_VENDOR_SILAN
if NET_VENDOR_SILAN
config SC92031
tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL
tristate "Silan SC92031 PCI Fast Ethernet Adapter driver"
depends on PCI
select CRC32
---help---
This is a driver for the Fast Ethernet PCI network cards based on

4
drivers/net/ethernet/stmicro/stmmac/Kconfig
View File

@@ -26,8 +26,8 @@ config STMMAC_PLATFORM
If unsure, say N.
config STMMAC_PCI
bool "STMMAC PCI bus support (EXPERIMENTAL)"
depends on STMMAC_ETH && PCI && EXPERIMENTAL
bool "STMMAC PCI bus support"
depends on STMMAC_ETH && PCI
---help---
This is to select the Synopsys DWMAC available on PCI devices,
if you have a controller with this interface, say Y or M here.

4
drivers/net/ethernet/sun/Kconfig
View File

@@ -32,8 +32,8 @@ config HAPPYMEAL
will be called sunhme.
config SUNBMAC
tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
depends on SBUS && EXPERIMENTAL
tristate "Sun BigMAC 10/100baseT support"
depends on SBUS
select CRC32
---help---
This driver supports the "be" interface available as an Sbus option.

4
drivers/net/ethernet/ti/Kconfig
View File

@@ -88,8 +88,8 @@ config TLAN
Please email feedback to <torben.mathiasen@compaq.com>.
config CPMAC
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
depends on EXPERIMENTAL && AR7
tristate "TI AR7 CPMAC Ethernet support"
depends on AR7
select PHYLIB
---help---
TI AR7 CPMAC Ethernet support