diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:48 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:48 +0100 |
| commit | 8417d689429075fe59d92af4036e25424b13ea9c (patch) | |
| tree | f0d341e6eae1cd5c4ca6180aeb29a00e21ff8a8e /drivers/net/ethernet/smsc/Kconfig | |
| parent | 83e4a8b0fe64a97fc92f436c7eff09569352c5ed (diff) | |
| parent | cee7bd6c72b15e357eb375a178532851c72e789c (diff) | |
Merge branch 'tracking-armlt-arm64' into integration-linux-vexpresstracking-integration-linux-vexpress-lsk-20130505.0
Conflicts:
drivers/clk/versatile/Makefile
Diffstat (limited to 'drivers/net/ethernet/smsc/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/smsc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig index 5a689af516e..bb4c1674ff9 100644 --- a/drivers/net/ethernet/smsc/Kconfig +++ b/drivers/net/ethernet/smsc/Kconfig @@ -5,7 +5,7 @@ config NET_VENDOR_SMSC bool "SMC (SMSC)/Western Digital devices" default y - depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \ + depends on ARM || ISA || MAC || ARM64 || MIPS || M32R || SUPERH || \ BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA ---help--- If you have a network (Ethernet) card belonging to this class, say Y @@ -40,7 +40,7 @@ config SMC91X select NET_CORE select MII depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \ - MN10300 || COLDFIRE) + MN10300 || COLDFIRE || ARM64) ---help--- This is a driver for SMC's 91x series of Ethernet chipsets, including the SMC91C94 and the SMC91C111. Say Y if you want it |