From 6e96f14624aad9a02e7cd8614995a500e30d2f29 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 30 Jan 2013 10:49:30 -0700
Subject: [PATCH] --- yaml --- r: 355247 b: refs/heads/master c:
 e1d7ef1cc472de30995a50ecb9c7aa3361f985f9 h: refs/heads/master i:   355245:
 29c723d036e9221d7f2e8493d5e620f1555ce721   355243:
 53db0da5fa3cf7f9d8da76696157ecda6eddbdfe   355239:
 f3476fc2195ece525c18261deb583f7f29e3f9c2   355231:
 358faefede3b0d4c34db77b43a6688e487a6f2b1 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/clocksource.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0aead9eacf3f..637968ec18bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80debae58435423def63632273139ee5fcb99c69
+refs/heads/master: e1d7ef1cc472de30995a50ecb9c7aa3361f985f9
diff --git a/trunk/include/linux/clocksource.h b/trunk/include/linux/clocksource.h
index 7944f14ea947..27cfda427dd9 100644
--- a/trunk/include/linux/clocksource.h
+++ b/trunk/include/linux/clocksource.h
@@ -339,6 +339,8 @@ extern void clocksource_of_init(void);
 	static const struct of_device_id __clksrc_of_table_##name	\
 		__used __section(__clksrc_of_table)			\
 		 = { .compatible = compat, .data = fn };
+#else
+#define CLOCKSOURCE_OF_DECLARE(name, compat, fn)
 #endif
 
 #endif /* _LINUX_CLOCKSOURCE_H */