diff options
| -rw-r--r-- | drivers/mmc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mmc/block.c (renamed from drivers/mmc/mmc_block.c) | 3 | ||||
| -rw-r--r-- | drivers/mmc/queue.c (renamed from drivers/mmc/mmc_queue.c) | 9 | ||||
| -rw-r--r-- | drivers/mmc/queue.h (renamed from drivers/mmc/mmc_queue.h) | 0 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 83ffb9326a5..9ef010a5160 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_MMC) += mmc_core.o # Media drivers # obj-$(CONFIG_MMC_BLOCK) += mmc_block.o +mmc_block-objs := block.o queue.o # # Host drivers @@ -26,7 +27,6 @@ obj-$(CONFIG_MMC_AT91) += at91_mci.o obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o mmc_core-y := mmc.o mmc_sysfs.o -mmc_core-$(CONFIG_BLOCK) += mmc_queue.o ifeq ($(CONFIG_MMC_DEBUG),y) EXTRA_CFLAGS += -DDEBUG diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/block.c index 63fbde8756a..8eba037a18e 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/block.c @@ -2,6 +2,7 @@ * Block driver for media (i.e., flash cards) * * Copyright 2002 Hewlett-Packard Company + * Copyright 2005-2007 Pierre Ossman * * Use consistent with the GNU GPL is permitted, * provided that this copyright notice is @@ -37,7 +38,7 @@ #include <asm/system.h> #include <asm/uaccess.h> -#include "mmc_queue.h" +#include "queue.h" /* * max 8 partitions per card diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/queue.c index c27e42645cd..aa75ac11a19 100644 --- a/drivers/mmc/mmc_queue.c +++ b/drivers/mmc/queue.c @@ -1,7 +1,8 @@ /* - * linux/drivers/mmc/mmc_queue.c + * linux/drivers/mmc/queue.c * * Copyright (C) 2003 Russell King, All Rights Reserved. + * Copyright 2006-2007 Pierre Ossman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -14,7 +15,7 @@ #include <linux/mmc/card.h> #include <linux/mmc/host.h> -#include "mmc_queue.h" +#include "queue.h" #define MMC_QUEUE_SUSPENDED (1 << 0) @@ -179,7 +180,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock blk_cleanup_queue(mq->queue); return ret; } -EXPORT_SYMBOL(mmc_init_queue); void mmc_cleanup_queue(struct mmc_queue *mq) { @@ -226,7 +226,6 @@ void mmc_queue_suspend(struct mmc_queue *mq) down(&mq->thread_sem); } } -EXPORT_SYMBOL(mmc_queue_suspend); /** * mmc_queue_resume - resume a previously suspended MMC request queue @@ -247,4 +246,4 @@ void mmc_queue_resume(struct mmc_queue *mq) spin_unlock_irqrestore(q->queue_lock, flags); } } -EXPORT_SYMBOL(mmc_queue_resume); + diff --git a/drivers/mmc/mmc_queue.h b/drivers/mmc/queue.h index c9f139e764f..c9f139e764f 100644 --- a/drivers/mmc/mmc_queue.h +++ b/drivers/mmc/queue.h |