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

Merge branch 'mxs/saif' into next/drivers

Browse Source 
Conflicts:
	drivers/net/ethernet/cadence/Kconfig
This commit is contained in:
Arnd Bergmann
2011-12-06 14:23:35 +00:00
parent 58a273745f b07fed455c
commit 3642a0a2c7
682 changed files with 7078 additions and 5081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.