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