Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git] / drivers / staging / phison / Makefile
1 obj-$(CONFIG_IDE_PHISON)        += phison.o