Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[~andy/linux] / arch / x86 / platform / scx200 / Makefile

obj-$(CONFIG_SCx200)            += scx200.o
scx200-y                        += scx200_32.o