8 files changed, 24 insertions, 18 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)
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 7d98990ac94e..800425e05165 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -10,7 +10,7 @@
 #ifndef LINUX_MMC_CARD_H
 #define LINUX_MMC_CARD_H
 
-#include <linux/mmc/mmc.h>
+#include <linux/mmc/core.h>
 
 struct mmc_cid {
         unsigned int            manfid;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/core.h
index b3d80efc6434..d8fd66cf28be 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/core.h
@@ -1,12 +1,12 @@
 /*
- *  linux/include/linux/mmc/mmc.h
+ *  linux/include/linux/mmc/core.h
  *
  * 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
  * published by the Free Software Foundation.
  */
-#ifndef MMC_H
-#define MMC_H
+#ifndef LINUX_MMC_CORE_H
+#define LINUX_MMC_CORE_H
 
 #include <linux/interrupt.h>
 #include <linux/device.h>
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 6ea3c0ea3e15..43bf6a5c398d 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -10,7 +10,7 @@
 #ifndef LINUX_MMC_HOST_H
 #define LINUX_MMC_HOST_H
 
-#include <linux/mmc/mmc.h>
+#include <linux/mmc/core.h>
 
 struct mmc_ios {
         unsigned int    clock;                  /* clock rate */