From 7e2592fd5ac3dce73aceb11e1526629840e52797 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 13 Dec 2012 20:49:07 +0000 Subject: m68k: Move CONFIG_EXTRA_CLOCK to arch_global_data Move inp_clk, vco_clk and flb_clk into arch_global_data and tidy up. Signed-off-by: Simon Glass --- arch/m68k/include/asm/global_data.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'arch/m68k/include') diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index d9be8b1..9f37dcc 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -30,6 +30,11 @@ struct arch_global_data { unsigned long i2c1_clk; unsigned long i2c2_clk; #endif +#ifdef CONFIG_EXTRA_CLOCK + unsigned long inp_clk; + unsigned long vco_clk; + unsigned long flb_clk; +#endif }; /* @@ -49,11 +54,6 @@ typedef struct global_data { #ifdef CONFIG_PCI unsigned long pci_clk; #endif -#ifdef CONFIG_EXTRA_CLOCK - unsigned long inp_clk; - unsigned long vco_clk; - unsigned long flb_clk; -#endif phys_size_t ram_size; /* RAM size */ unsigned long reloc_off; /* Relocation Offset */ unsigned long reset_status; /* reset status register at boot */ -- cgit v1.1