Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux
[linux-2.6] / drivers / staging / phison / Makefile
1 obj-$(CONFIG_IDE_PHISON)        += phison.o