From a929442e4ea7b26f4188eef90022fce12f9d5f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Tue, 28 Sep 2010 21:55:22 +0200
Subject: [PATCH] --- yaml --- r: 212543 b: refs/heads/master c:
 214b43100fd59e55fcd265329aafd14ab01ec30d h: refs/heads/master i:   212541:
 2e303d4348de2f742b0ff421d5ce0e11c3161f6d   212539:
 12f0f3037246daaf7fea8ad75975280dd4ad2400   212535:
 e2099aeeb94ec6f16dcb269afa2b12135410752d   212527:
 3179f867b4c5e559ebd511fed9a8ad04fe9104e1   212511:
 758c878e42a638a9e1967e8c4d8d8a2aee74de36   212479:
 493f017ed3e1b0029d32a37dbad4046f8e6ee297 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/mach-imx/pcm970-baseboard.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a9528beab620..644ee9638aa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c80ee51707ec9fcf137bc7b511d2853b772eae6
+refs/heads/master: 214b43100fd59e55fcd265329aafd14ab01ec30d
diff --git a/trunk/arch/arm/mach-imx/pcm970-baseboard.c b/trunk/arch/arm/mach-imx/pcm970-baseboard.c
index 7cffad880e42..9110d9cca7a2 100644
--- a/trunk/arch/arm/mach-imx/pcm970-baseboard.c
+++ b/trunk/arch/arm/mach-imx/pcm970-baseboard.c
@@ -200,7 +200,7 @@ static struct resource pcm970_sja1000_resources[] = {
 	},
 };
 
-struct sja1000_platform_data pcm970_sja1000_platform_data = {
+static struct sja1000_platform_data pcm970_sja1000_platform_data = {
 	.osc_freq	= 16000000,
 	.ocr		= OCR_TX1_PULLDOWN | OCR_TX0_PUSHPULL,
 	.cdr		= CDR_CBP,