Merge branch 'master' into export-slabh
[linux-2.6-block.git] / drivers / net / octeon / Makefile
CommitLineData
d6aa60a1
DD
1
2obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o