summaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/card.h2
-rw-r--r--include/linux/mmc/core.h (renamed from include/linux/mmc/mmc.h)6
-rw-r--r--include/linux/mmc/host.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 7d98990ac94..800425e0516 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 b3d80efc643..d8fd66cf28b 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 6ea3c0ea3e1..43bf6a5c398 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 */