Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / powerpc / cpu / mpc512x / pci.c

diff --git a/arch/powerpc/cpu/mpc512x/pci.c b/arch/powerpc/cpu/mpc512x/pci.c
index 141db8b86594ab9703d9edb7c411839e3f9e34e1..7ea5df2960be4c12f51183c15dc0ea580d04e952 100644 (file)
--- a/arch/powerpc/cpu/mpc512x/pci.c
+++ b/arch/powerpc/cpu/mpc512x/pci.c
@@ -2,23 +2,7 @@
  * Copyright (C) 2009-2010 DENX Software Engineering <wd@denx.de>
  * Copyright (C) Freescale Semiconductor, Inc. 2006, 2007.
  *
- * 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+
  */
 
 #include <common.h>
@@ -52,7 +36,6 @@ pci_init_board(void)
        volatile law512x_t *pci_law;
        volatile pot512x_t *pci_pot;
        volatile pcictrl512x_t *pci_ctrl;
-       volatile pciconf512x_t *pci_conf;
        u16 reg16;
        u32 reg32;
        u32 dev;
@@ -73,7 +56,6 @@ pci_init_board(void)
        pci_law = im->sysconf.pcilaw;
        pci_pot = im->ios.pot;
        pci_ctrl = &im->pci_ctrl;
-       pci_conf = &im->pci_conf;
 
        hose = &pci_hose;