Merge branch 'x86/cpu' into x86/core
[linux-2.6] / drivers / net / cris / Makefile
1 obj-$(CONFIG_ETRAX_ARCH_V10) += eth_v10.o