Skip to content

Commit

Permalink
mmc: sdhci-pxa: move platform data to include/linux/platform_data
Browse files Browse the repository at this point in the history
As suggested by Arnd, move platform data to include/linux/platform_data
in order to improve build coverage for the driver.

Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Zhangfei Gao authored and Chris Ball committed Jul 20, 2011
1 parent c984c26 commit bfed345
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-mmp/include/mach/mmp2.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef __ASM_MACH_MMP2_H
#define __ASM_MACH_MMP2_H

#include <plat/sdhci.h>
#include <linux/platform_data/pxa_sdhci.h>

struct sys_timer;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-pxav2.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <linux/gpio.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
#include <plat/sdhci.h>
#include <linux/platform_data/pxa_sdhci.h>
#include <linux/slab.h>
#include "sdhci.h"
#include "sdhci-pltfm.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/host/sdhci-pxav3.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <linux/gpio.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
#include <plat/sdhci.h>
#include <linux/platform_data/pxa_sdhci.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include "sdhci.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* linux/arch/arm/plat-pxa/include/plat/sdhci.h
/*
* include/linux/platform_data/pxa_sdhci.h
*
* Copyright 2010 Marvell
* Zhangfei Gao <zhangfei.gao@marvell.com>
Expand All @@ -10,8 +11,8 @@
* published by the Free Software Foundation.
*/

#ifndef __PLAT_PXA_SDHCI_H
#define __PLAT_PXA_SDHCI_H
#ifndef _PXA_SDHCI_H_
#define _PXA_SDHCI_H_

/* pxa specific flag */
/* Require clock free running */
Expand Down Expand Up @@ -56,5 +57,4 @@ struct sdhci_pxa {
u8 clk_enable;
u8 power_mode;
};

#endif /* __PLAT_PXA_SDHCI_H */
#endif /* _PXA_SDHCI_H_ */

0 comments on commit bfed345

Please sign in to comment.