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

Merge commit 'origin'

Browse Source 
Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
This commit is contained in:
Benjamin Herrenschmidt
2008-10-15 11:31:54 +11:00
parent ee673eaa72 8acd3a60bc
commit 6dc6472581
5097 changed files with 278765 additions and 138501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ibm_newemac/Kconfig
View File

@@ -1,6 +1,6 @@
config IBM_NEW_EMAC
tristate "IBM EMAC Ethernet support"
depends on PPC_DCR && PPC_MERGE
depends on PPC_DCR
select CRC32
help
This driver supports the IBM EMAC family of Ethernet controllers