aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/bootp/init.S2
-rw-r--r--arch/arm/common/clkdev.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
index df7bc7068d0f..8b0de41c3dcb 100644
--- a/arch/arm/boot/bootp/init.S
+++ b/arch/arm/boot/bootp/init.S
@@ -49,7 +49,7 @@ _start: add lr, pc, #-0x8 @ lr = current load addr
49/* 49/*
50 * find the end of the tag list, and then add an INITRD tag on the end. 50 * find the end of the tag list, and then add an INITRD tag on the end.
51 * If there is already an INITRD tag, then we ignore it; the last INITRD 51 * If there is already an INITRD tag, then we ignore it; the last INITRD
52 * tag takes precidence. 52 * tag takes precedence.
53 */ 53 */
54taglist: ldr r10, [r9, #0] @ tag length 54taglist: ldr r10, [r9, #0] @ tag length
55 teq r10, #0 @ last tag (zero length)? 55 teq r10, #0 @ last tag (zero length)?
diff --git a/arch/arm/common/clkdev.c b/arch/arm/common/clkdev.c
index aae5bc01acc8..6f29b5ccea4d 100644
--- a/arch/arm/common/clkdev.c
+++ b/arch/arm/common/clkdev.c
@@ -32,7 +32,7 @@ static DEFINE_MUTEX(clocks_mutex);
32 * If an entry has a device ID, it must match 32 * If an entry has a device ID, it must match
33 * If an entry has a connection ID, it must match 33 * If an entry has a connection ID, it must match
34 * Then we take the most specific entry - with the following 34 * Then we take the most specific entry - with the following
35 * order of precidence: dev+con > dev only > con only. 35 * order of precedence: dev+con > dev only > con only.
36 */ 36 */
37static struct clk *clk_find(const char *dev_id, const char *con_id) 37static struct clk *clk_find(const char *dev_id, const char *con_id)
38{ 38{