diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:52 +0100 |
| commit | d3c96d65222b3ae99f03affda5ecd05fdb9873a4 (patch) | |
| tree | 1087466b3a6fd116c3ae775758f5510ace6bfed1 /arch | |
| parent | 4a53361beb278b110d1b73ca71398ecb7de54fed (diff) | |
| parent | 6b5f0d4c9a1789f517e12e3958ba20899db9a1f4 (diff) | |
| download | barebox-d3c96d65222b3ae99f03affda5ecd05fdb9873a4.tar.gz barebox-d3c96d65222b3ae99f03affda5ecd05fdb9873a4.tar.xz | |
Merge branch 'for-next/mci'
Conflicts:
arch/arm/boards/tqma53/board.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/esdhc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/esdhc.h b/arch/arm/mach-imx/include/mach/esdhc.h index add1691c4b..fb7380a182 100644 --- a/arch/arm/mach-imx/include/mach/esdhc.h +++ b/arch/arm/mach-imx/include/mach/esdhc.h @@ -42,5 +42,7 @@ struct esdhc_platform_data { enum cd_types cd_type; unsigned caps; char *devname; + unsigned dsr_val; + int use_dsr; }; #endif /* __ASM_ARCH_IMX_ESDHC_H */ |