Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[linux-2.6] / drivers / staging / slicoss / Makefile
1 obj-$(CONFIG_SLICOSS) += slicoss.o