Merge tag 'for-linus-20130301' of git://git.infradead.org/linux-mtd

[~andy/linux] / drivers / misc / carma / Makefile

obj-$(CONFIG_CARMA_FPGA)                += carma-fpga.o
obj-$(CONFIG_CARMA_FPGA_PROGRAM)        += carma-fpga-program.o