Merge branch 'linus' into tracing/core
[linux-2.6] / drivers / staging / echo / Makefile
1 obj-$(CONFIG_ECHO) += echo.o