06991c28f3
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
If you need me to provide a merged tree to handle these resolutions,
please let me know.
Other than those patches, there's not much here, some minor fixes and
updates.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
=yWAQ
-----END PGP SIGNATURE-----
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()
...
70 lines
2.2 KiB
Plaintext
70 lines
2.2 KiB
Plaintext
#
|
|
# Intel 82596/82593/82596 network device configuration
|
|
#
|
|
|
|
config NET_VENDOR_I825XX
|
|
bool "Intel (82586/82593/82596) devices"
|
|
default y
|
|
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
|
|
<http://www.tldp.org/docs.html#howto>.
|
|
|
|
Note that the answer to this question does not directly affect the
|
|
kernel: saying N will just cause the configurator to skip all
|
|
the questions about these devices. If you say Y, you will be asked for
|
|
your specific card in the following questions.
|
|
|
|
if NET_VENDOR_I825XX
|
|
|
|
config ARM_ETHER1
|
|
tristate "Acorn Ether1 support"
|
|
depends on ARM && ARCH_ACORN
|
|
---help---
|
|
If you have an Acorn system with one of these (AKA25) network cards,
|
|
you should say Y to this option if you wish to use it with Linux.
|
|
|
|
config BVME6000_NET
|
|
tristate "BVME6000 Ethernet support"
|
|
depends on BVME6000
|
|
---help---
|
|
This is the driver for the Ethernet interface on BVME4000 and
|
|
BVME6000 VME boards. Say Y here to include the driver for this chip
|
|
in your kernel.
|
|
To compile this driver as a module, choose M here.
|
|
|
|
config LASI_82596
|
|
tristate "Lasi ethernet"
|
|
depends on GSC
|
|
---help---
|
|
Say Y here to support the builtin Intel 82596 ethernet controller
|
|
found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet.
|
|
|
|
config MVME16x_NET
|
|
tristate "MVME16x Ethernet support"
|
|
depends on MVME16x
|
|
---help---
|
|
This is the driver for the Ethernet interface on the Motorola
|
|
MVME162, 166, 167, 172 and 177 boards. Say Y here to include the
|
|
driver for this chip in your kernel.
|
|
To compile this driver as a module, choose M here.
|
|
|
|
config SNI_82596
|
|
tristate "SNI RM ethernet"
|
|
depends on SNI_RM
|
|
---help---
|
|
Say Y here to support the on-board Intel 82596 ethernet controller
|
|
built into SNI RM machines.
|
|
|
|
config SUN3_82586
|
|
bool "Sun3 on-board Intel 82586 support"
|
|
depends on SUN3
|
|
---help---
|
|
This driver enables support for the on-board Intel 82586 based
|
|
Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards. Note
|
|
that this driver does not support 82586-based adapters on additional
|
|
VME boards.
|
|
|
|
endif # NET_VENDOR_I825XX
|