From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Mon, 21 Apr 2014 18:13:48 +0000 (+0200)
Subject: Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
X-Git-Tag: v2014.07-rc1~2^2~4
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=94b972d366c29b92319865e3ded16da062aa8507;hp=d381294aef4a5b6ddeda3685519330a5b73d884f

Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
---

diff --git a/Makefile b/Makefile
index b2937e95e1..c91c10ed3a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 VERSION = 2014
 PATCHLEVEL = 04
 SUBLEVEL =
-EXTRAVERSION = -rc3
+EXTRAVERSION =
 NAME =
 
 # *DOCUMENTATION*
diff --git a/drivers/i2c/sh_i2c.c b/drivers/i2c/sh_i2c.c
index cc19100750..e7e96921d2 100644
--- a/drivers/i2c/sh_i2c.c
+++ b/drivers/i2c/sh_i2c.c
@@ -269,7 +269,9 @@ static int sh_i2c_write(struct i2c_adapter *adap, uint8_t chip, uint addr,
 static int
 sh_i2c_probe(struct i2c_adapter *adap, u8 dev)
 {
-	return sh_i2c_read(adap, dev, 0, 0, NULL, 0);
+	u8 dummy[1];
+
+	return sh_i2c_read(adap, dev, 0, 0, dummy, sizeof dummy);
 }
 
 static unsigned int sh_i2c_set_bus_speed(struct i2c_adapter *adap,
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 4d11c7d08c..5a13ad1139 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -15,6 +15,7 @@
 #define CONFIG_KZM_A9_GT
 #define CONFIG_RMOBILE_BOARD_STRING	"KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
+#define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/rmobile.h>