clk: bcm281xx: define U32_MAX conditionally for now

Message ID 52E6DA8F.50200@linaro.org
State New
Headers show

Commit Message

Alex Elder Jan. 27, 2014, 10:15 p.m.
-------- Original Message --------
Subject: [PATCH 1/1] clk: bcm281xx: define U32_MAX conditionally for now
Date: Fri, 27 Dec 2013 08:39:57 -0600
From: Alex Elder <alex.elder@linaro.org>
To: mturquette@linaro.org
CC: akpm@linux-foundation.org, sfr@canb.auug.org.au

A separate patch that defines U32_MAX in <linux/kernel.h> has been
accepted and will cause a build problem if it is present in the tree
without this change.  Defining these symbols conditionally avoids
this problem.  The block of definitions found in this "clk-kona.h"
can be deleted later.

Signed-off-by: Alex Elder <elder@linaro.org>
---
 drivers/clk/bcm/clk-kona.h |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/drivers/clk/bcm/clk-kona.h b/drivers/clk/bcm/clk-kona.h
index 2a01cbd..b1991b3 100644
--- a/drivers/clk/bcm/clk-kona.h
+++ b/drivers/clk/bcm/clk-kona.h
@@ -25,9 +25,11 @@ 

 #define	BILLION		1000000000

+#ifndef U32_MAX
 #define U8_MAX	((u8)~0U)
 #define U32_MAX	((u32)~0U)
 #define U64_MAX	((u64)~0U)
+#endif /* !U32_MAX */

 /* The common clock framework uses u8 to represent a parent index */
 #define PARENT_COUNT_MAX	((u32)U8_MAX)