Merge git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / arch / powerpc / include / asm / global_data.h

diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index d5db8549cc93770e8d7f5d4fd7cd96fd116768a5..8e59e8ba74b4073c1e8d17789b6592e25c842145 100644 (file)
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/include/asm/global_data.h
@@ -2,23 +2,7 @@
  * (C) Copyright 2002-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef        __ASM_GBL_DATA_H
@@ -104,12 +88,6 @@ struct arch_global_data {
        u32 ips_clk;
        u32 csb_clk;
 #endif /* CONFIG_MPC512X */
-#if defined(CONFIG_MPC8220)
-       unsigned long inp_clk;
-       unsigned long vco_clk;
-       unsigned long pev_clk;
-       unsigned long flb_clk;
-#endif
        unsigned long reset_status;     /* reset status register at boot */
 #if defined(CONFIG_MPC83xx)
        unsigned long arbiter_event_attributes;