diff options
| author | Tejun Heo <tj@kernel.org> | 2015-11-03 17:29:03 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-11-03 17:29:03 -0500 |
| commit | 159b5bb46492e4dcef2070b12861030bc360402b (patch) | |
| tree | 93de7d6e94a059aade50ee5437de6a50ccd1cf7b /drivers/mmc/host/atmel-mci.c | |
| parent | 56e74338a535cbcc2f2da08b1ea1a92920194364 (diff) | |
| parent | 469eabb3aec03d9defed3462df743a223a5c8f54 (diff) | |
Merge branch 'for-4.3-fixes' into for-4.4
Diffstat (limited to 'drivers/mmc/host/atmel-mci.c')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 9a39e0b7e583..bf62e429f7fc 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -29,7 +29,6 @@ #include <linux/slab.h> #include <linux/stat.h> #include <linux/types.h> -#include <linux/platform_data/atmel.h> #include <linux/platform_data/mmc-atmel-mci.h> #include <linux/mmc/host.h> |