diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-14 20:05:31 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-14 20:05:31 (GMT) |
| commit | e1e3cf7c79d97e7c59f90036d6e1e8e9d3abfbbe (patch) | |
| tree | a8401d3287fd63aae1c179fcd0bad9f919ee67ee /arch/powerpc/include/asm/global_data.h | |
| parent | 50298d37e698a6c730eacf1811da5e7011e20113 (diff) | |
| parent | 4e43b2e861b981560b19c037c801b56c87575351 (diff) | |
| download | u-boot-e1e3cf7c79d97e7c59f90036d6e1e8e9d3abfbbe.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch/powerpc/include/asm/global_data.h')
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index d3dd44e..c854ce9 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -60,7 +60,8 @@ typedef struct global_data { #if defined(CONFIG_MPC83xx) /* There are other clocks in the MPC83XX */ u32 csb_clk; -#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC831x) || defined(CONFIG_MPC837x) +#if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) || \ + defined(CONFIG_MPC834x) || defined(CONFIG_MPC837x) u32 tsec1_clk; u32 tsec2_clk; u32 usbdr_clk; @@ -76,7 +77,8 @@ typedef struct global_data { u32 lbiu_clk; u32 lclk_clk; u32 pci_clk; -#if defined(CONFIG_MPC837x) || defined(CONFIG_MPC831x) +#if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) || \ + defined(CONFIG_MPC837x) u32 pciexp1_clk; u32 pciexp2_clk; #endif |