projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux.git]
/
include
/
linux
/
platform_data
/
mmc-msm_sdcc.h
diff --git
a/include/linux/platform_data/mmc-msm_sdcc.h
b/include/linux/platform_data/mmc-msm_sdcc.h
index ffcd9e3a6a7e81578f22624d839278c4906f3a99..55aa873c93963011e5f098eed66fc1f012ec88e6 100644
(file)
--- a/
include/linux/platform_data/mmc-msm_sdcc.h
+++ b/
include/linux/platform_data/mmc-msm_sdcc.h
@@
-1,8
+1,5
@@
-/*
- * arch/arm/include/asm/mach/mmc.h
- */
-#ifndef ASMARM_MACH_MMC_H
-#define ASMARM_MACH_MMC_H
+#ifndef __MMC_MSM_SDCC_H
+#define __MMC_MSM_SDCC_H
#include <linux/mmc/host.h>
#include <linux/mmc/card.h>