diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:23:35 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:23:35 +0000 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /drivers/net/ethernet/cadence/Kconfig | |
| parent | Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers (diff) | |
| parent | ARM: mx28evk: set a initial clock rate for saif (diff) | |
| download | linux-dev-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.tar.xz linux-dev-3642a0a2c7d2d1949988d0fd004a8039c1f3d02f.zip | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'drivers/net/ethernet/cadence/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/cadence/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index a2e150059bc7..db931916da08 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig @@ -7,6 +7,7 @@ config HAVE_NET_MACB config NET_CADENCE bool "Cadence devices" + default y depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200) ---help--- If you have a network (Ethernet) card belonging to this class, say Y. |