diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:49:30 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:49:30 +0000 |
| commit | c94f28c383f58c9de74678e0f1624db9c5f8a8cb (patch) | |
| tree | 3281184f026cb79cee6c20fe29c994ba654cbbe4 /drivers/mmc/card/Makefile | |
| parent | df15315899c0641412bd54b29565a70b078a6ac8 (diff) | |
| parent | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/mmc/card/Makefile')
| -rw-r--r-- | drivers/mmc/card/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile index 0d407514f67..c73b406a06c 100644 --- a/drivers/mmc/card/Makefile +++ b/drivers/mmc/card/Makefile @@ -2,10 +2,6 @@ # Makefile for MMC/SD card drivers # -ifeq ($(CONFIG_MMC_DEBUG),y) - EXTRA_CFLAGS += -DDEBUG -endif - obj-$(CONFIG_MMC_BLOCK) += mmc_block.o mmc_block-objs := block.o queue.o obj-$(CONFIG_MMC_TEST) += mmc_test.o |