Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313182
b: refs/heads/master
c: 114ea99
h: refs/heads/master
v: v3
  • Loading branch information
Benoît Thébaudeau authored and Sascha Hauer committed Jul 9, 2012
1 parent d139992 commit 2fe8e5b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 76e30b81e637d9dc52302fee76092235f1ac590f
refs/heads/master: 114ea991eca8ae706c42b1884aec83033be274b1
4 changes: 4 additions & 0 deletions trunk/arch/arm/mach-imx/devices-imx35.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ extern const struct imx_mxc_nand_data imx35_mxc_nand_data;
#define imx35_add_mxc_nand(pdata) \
imx_add_mxc_nand(&imx35_mxc_nand_data, pdata)

extern const struct imx_mxc_rtc_data imx35_mxc_rtc_data;
#define imx35_add_mxc_rtc() \
imx_add_mxc_rtc(&imx35_mxc_rtc_data)

extern const struct imx_mxc_w1_data imx35_mxc_w1_data;
#define imx35_add_mxc_w1(pdata) \
imx_add_mxc_w1(&imx35_mxc_w1_data)
Expand Down
5 changes: 5 additions & 0 deletions trunk/arch/arm/plat-mxc/devices/platform-mxc_rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ const struct imx_mxc_rtc_data imx31_mxc_rtc_data __initconst =
imx_mxc_rtc_data_entry_single(MX31);
#endif /* ifdef CONFIG_SOC_IMX31 */

#ifdef CONFIG_SOC_IMX35
const struct imx_mxc_rtc_data imx35_mxc_rtc_data __initconst =
imx_mxc_rtc_data_entry_single(MX35);
#endif /* ifdef CONFIG_SOC_IMX35 */

struct platform_device *__init imx_add_mxc_rtc(
const struct imx_mxc_rtc_data *data)
{
Expand Down

0 comments on commit 2fe8e5b

Please sign in to comment.