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

[u-boot] / include / configs / u8500_href.h

diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h
index 1bb612826ebb53f0c7220340136e52bbe14705c7..0c97ab1894eaa8b3ed2706f26d73c7125c1ab519 100644 (file)
--- a/include/configs/u8500_href.h
+++ b/include/configs/u8500_href.h
@@ -1,23 +1,7 @@
 /*
  * Copyright (C) ST-Ericsson SA 2009
  *
- * 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 __CONFIG_H
@@ -166,7 +150,6 @@
  */
 #define CONFIG_U8500_I2C
 #undef CONFIG_HARD_I2C                 /* I2C with hardware support */
-#undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
 #define CONFIG_I2C_MULTI_BUS
 #define CONFIG_SYS_I2C_SPEED           100000
 #define CONFIG_SYS_I2C_SLAVE           0       /* slave addr of controller */