drivers/memstick/host/Makefile

   1 #
   2 # Makefile for MemoryStick host controller drivers
   3 #
   4
   5 ifeq ($(CONFIG_MEMSTICK_DEBUG),y)
   6 <<<<<<< HEAD:drivers/memstick/host/Makefile
   7         EXTRA_CFLAGS            += -DDEBUG
   8 =======
   9         EXTRA_CFLAGS                    += -DDEBUG
  10 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:drivers/memstick/host/Makefile
  11 endif
  12
  13 <<<<<<< HEAD:drivers/memstick/host/Makefile
  14 obj-$(CONFIG_MEMSTICK_TIFM_MS)  += tifm_ms.o
  15
  16 =======
  17 obj-$(CONFIG_MEMSTICK_TIFM_MS)          += tifm_ms.o
  18 obj-$(CONFIG_MEMSTICK_JMICRON_38X)      += jmb38x_ms.o
  19 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:drivers/memstick/host/Makefile