drivers/net/ibm_newemac/Kconfig · b8c2b05e14fbe1ba3fffa31931a1a9ef8da933f9 · xcap / xcap-capability-linux

16 years ago

Benjamin Herrenschmidt authored 16 years ago

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

6dc64725

Benjamin Herrenschmidt authored 16 years ago

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h