diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-28 00:26:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-28 00:26:52 +0200 |
| commit | 0ba6bfef061872dbe04e6bebbb225806c7fa34ec (patch) | |
| tree | 25d0e07c2d902998c3a679aaf6bf4ffedff9289c /include/asm-ppc/global_data.h | |
| parent | d26b739afe5a6760bd345743188759cd9d0f3b47 (diff) | |
| parent | 9cff4448a9cb882defe6c8bde73b77fc0c636799 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/asm-ppc/global_data.h')
| -rw-r--r-- | include/asm-ppc/global_data.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index be2ce24778..c09b07d36a 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -70,9 +70,6 @@ typedef struct global_data { #if defined(CONFIG_MPC8315) u32 tdm_clk; #endif -#if defined(CONFIG_MPC837X) - u32 sdhc_clk; -#endif u32 core_clk; u32 enc_clk; u32 lbiu_clk; @@ -89,6 +86,9 @@ typedef struct global_data { u32 mem_sec_clk; #endif /* CONFIG_MPC8360 */ #endif +#if defined(CONFIG_MPC837X) || defined(CONFIG_MPC8536) + u32 sdhc_clk; +#endif #if defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) u32 i2c1_clk; u32 i2c2_clk; |