Merge branch 'master' into for-upstream
[linux-2.6] / drivers / staging / slicoss / Makefile
1 obj-$(CONFIG_SLICOSS) += slicoss.o