diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2007-02-28 15:33:10 +0100 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-01 13:04:18 +0200 |
| commit | aaac1b470bd0dccb30912356617069dc6199cc80 (patch) | |
| tree | 123316b4a6c10bf2e884d0469994f3435d03e22c /drivers/mmc | |
| parent | b855885e3b60cf6f9452848712a62517b94583eb (diff) | |
| download | linux-stable-aaac1b470bd0dccb30912356617069dc6199cc80.tar.gz linux-stable-aaac1b470bd0dccb30912356617069dc6199cc80.tar.bz2 linux-stable-aaac1b470bd0dccb30912356617069dc6199cc80.zip | |
mmc: Move core functions to subdir
Create a "core" subdirectory to house the central bus handling
functions.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/Makefile | 7 | ||||
| -rw-r--r-- | drivers/mmc/core/Makefile | 11 | ||||
| -rw-r--r-- | drivers/mmc/core/core.c (renamed from drivers/mmc/mmc.c) | 4 | ||||
| -rw-r--r-- | drivers/mmc/core/core.h (renamed from drivers/mmc/mmc.h) | 6 | ||||
| -rw-r--r-- | drivers/mmc/core/sysfs.c (renamed from drivers/mmc/mmc_sysfs.c) | 4 |
5 files changed, 19 insertions, 13 deletions
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 4d2bdfeb8d76..9979f5e9765b 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -6,12 +6,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y) EXTRA_CFLAGS += -DDEBUG endif -# -# Core -# -obj-$(CONFIG_MMC) += mmc_core.o -mmc_core-y := mmc.o mmc_sysfs.o - +obj-$(CONFIG_MMC) += core/ obj-$(CONFIG_MMC) += card/ obj-$(CONFIG_MMC) += host/ diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile new file mode 100644 index 000000000000..f911fbd2845b --- /dev/null +++ b/drivers/mmc/core/Makefile @@ -0,0 +1,11 @@ +# +# Makefile for the kernel mmc core. +# + +ifeq ($(CONFIG_MMC_DEBUG),y) + EXTRA_CFLAGS += -DDEBUG +endif + +obj-$(CONFIG_MMC) += mmc_core.o +mmc_core-y := core.o sysfs.o + diff --git a/drivers/mmc/mmc.c b/drivers/mmc/core/core.c index 3f50b8882c89..334e663e465b 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/core/core.c @@ -1,5 +1,5 @@ /* - * linux/drivers/mmc/mmc.c + * linux/drivers/mmc/core/core.c * * Copyright (C) 2003-2004 Russell King, All Rights Reserved. * SD support Copyright (C) 2004 Ian Molton, All Rights Reserved. @@ -25,7 +25,7 @@ #include <linux/mmc/host.h> #include <linux/mmc/protocol.h> -#include "mmc.h" +#include "core.h" #define CMD_RETRIES 3 diff --git a/drivers/mmc/mmc.h b/drivers/mmc/core/core.h index 149affe0b686..076cb2f49a0f 100644 --- a/drivers/mmc/mmc.h +++ b/drivers/mmc/core/core.h @@ -1,5 +1,5 @@ /* - * linux/drivers/mmc/mmc.h + * linux/drivers/mmc/core/core.h * * Copyright (C) 2003 Russell King, All Rights Reserved. * @@ -7,8 +7,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifndef _MMC_H -#define _MMC_H +#ifndef _MMC_CORE_H +#define _MMC_CORE_H /* core-internal functions */ void mmc_init_card(struct mmc_card *card, struct mmc_host *host); int mmc_register_card(struct mmc_card *card); diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/core/sysfs.c index 06f264b2f79c..bf9a5f8beb86 100644 --- a/drivers/mmc/mmc_sysfs.c +++ b/drivers/mmc/core/sysfs.c @@ -1,5 +1,5 @@ /* - * linux/drivers/mmc/mmc_sysfs.c + * linux/drivers/mmc/core/sysfs.c * * Copyright (C) 2003 Russell King, All Rights Reserved. * @@ -18,7 +18,7 @@ #include <linux/mmc/card.h> #include <linux/mmc/host.h> -#include "mmc.h" +#include "core.h" #define dev_to_mmc_card(d) container_of(d, struct mmc_card, dev) #define to_mmc_driver(d) container_of(d, struct mmc_driver, drv) |