diff options
| author | Tom Rini <trini@ti.com> | 2015-02-25 18:14:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-25 18:14:18 -0500 |
| commit | 1606b34aa50804227806971dbb6b82ea0bf81f55 (patch) | |
| tree | 5c7570722616c6509f6f9126521d0c69c2614f8d /arch/arm/include/asm/global_data.h | |
| parent | 47d8ae4069b47ce966c0c5e0d8dd041e69ee1f86 (diff) | |
| parent | 94e3c8c4fd7bfe395fa467973cd647551d6d98c7 (diff) | |
| download | talos-obmc-uboot-1606b34aa50804227806971dbb6b82ea0bf81f55.tar.gz talos-obmc-uboot-1606b34aa50804227806971dbb6b82ea0bf81f55.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 438f128326..bb24f33d0d 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -48,6 +48,9 @@ struct arch_global_data { #ifdef CONFIG_OMAP struct omap_boot_parameters omap_boot_params; #endif +#ifdef CONFIG_FSL_LSCH3 + unsigned long mem2_clk; +#endif }; #include <asm-generic/global_data.h> |
