aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/Makefile2
-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 83ffb9326a54..9ef010a51608 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_MMC) += mmc_core.o
11# Media drivers 11# Media drivers
12# 12#
13obj-$(CONFIG_MMC_BLOCK) += mmc_block.o 13obj-$(CONFIG_MMC_BLOCK) += mmc_block.o
14mmc_block-objs := block.o queue.o
14 15
15# 16#
16# Host drivers 17# Host drivers
@@ -26,7 +27,6 @@ obj-$(CONFIG_MMC_AT91) += at91_mci.o
26obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o 27obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o
27 28
28mmc_core-y := mmc.o mmc_sysfs.o 29mmc_core-y := mmc.o mmc_sysfs.o
29mmc_core-$(CONFIG_BLOCK) += mmc_queue.o
30 30
31ifeq ($(CONFIG_MMC_DEBUG),y) 31ifeq ($(CONFIG_MMC_DEBUG),y)
32EXTRA_CFLAGS += -DDEBUG 32EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/block.c
index 63fbde8756ac..8eba037a18e0 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/block.c
@@ -2,6 +2,7 @@
2 * Block driver for media (i.e., flash cards) 2 * Block driver for media (i.e., flash cards)
3 * 3 *
4 * Copyright 2002 Hewlett-Packard Company 4 * Copyright 2002 Hewlett-Packard Company
5 * Copyright 2005-2007 Pierre Ossman
5 * 6 *
6 * Use consistent with the GNU GPL is permitted, 7 * Use consistent with the GNU GPL is permitted,
7 * provided that this copyright notice is 8 * provided that this copyright notice is
@@ -37,7 +38,7 @@
37#include <asm/system.h> 38#include <asm/system.h>
38#include <asm/uaccess.h> 39#include <asm/uaccess.h>
39 40
40#include "mmc_queue.h" 41#include "queue.h"
41 42
42/* 43/*
43 * max 8 partitions per card 44 * max 8 partitions per card
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/queue.c
index c27e42645cdb..aa75ac11a19e 100644
--- a/drivers/mmc/mmc_queue.c
+++ b/drivers/mmc/queue.c
@@ -1,7 +1,8 @@
1/* 1/*
2 * linux/drivers/mmc/mmc_queue.c 2 * linux/drivers/mmc/queue.c
3 * 3 *
4 * Copyright (C) 2003 Russell King, All Rights Reserved. 4 * Copyright (C) 2003 Russell King, All Rights Reserved.
5 * Copyright 2006-2007 Pierre Ossman
5 * 6 *
6 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 8 * it under the terms of the GNU General Public License version 2 as
@@ -14,7 +15,7 @@
14 15
15#include <linux/mmc/card.h> 16#include <linux/mmc/card.h>
16#include <linux/mmc/host.h> 17#include <linux/mmc/host.h>
17#include "mmc_queue.h" 18#include "queue.h"
18 19
19#define MMC_QUEUE_SUSPENDED (1 << 0) 20#define MMC_QUEUE_SUSPENDED (1 << 0)
20 21
@@ -179,7 +180,6 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
179 blk_cleanup_queue(mq->queue); 180 blk_cleanup_queue(mq->queue);
180 return ret; 181 return ret;
181} 182}
182EXPORT_SYMBOL(mmc_init_queue);
183 183
184void mmc_cleanup_queue(struct mmc_queue *mq) 184void mmc_cleanup_queue(struct mmc_queue *mq)
185{ 185{
@@ -226,7 +226,6 @@ void mmc_queue_suspend(struct mmc_queue *mq)
226 down(&mq->thread_sem); 226 down(&mq->thread_sem);
227 } 227 }
228} 228}
229EXPORT_SYMBOL(mmc_queue_suspend);
230 229
231/** 230/**
232 * mmc_queue_resume - resume a previously suspended MMC request queue 231 * mmc_queue_resume - resume a previously suspended MMC request queue
@@ -247,4 +246,4 @@ void mmc_queue_resume(struct mmc_queue *mq)
247 spin_unlock_irqrestore(q->queue_lock, flags); 246 spin_unlock_irqrestore(q->queue_lock, flags);
248 } 247 }
249} 248}
250EXPORT_SYMBOL(mmc_queue_resume); 249
diff --git a/drivers/mmc/mmc_queue.h b/drivers/mmc/queue.h
index c9f139e764f6..c9f139e764f6 100644
--- a/drivers/mmc/mmc_queue.h
+++ b/drivers/mmc/queue.h