Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336500
b: refs/heads/master
c: 401301c
h: refs/heads/master
v: v3
  • Loading branch information
Linus Walleij authored and Mike Turquette committed Nov 21, 2012
1 parent d66af4f commit 06fcb6e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f58945392aad6a07ede5455ebb584aa729ac1ef0
refs/heads/master: 401301ccdf516fa4b3b90216414a2a15fb826208
6 changes: 6 additions & 0 deletions trunk/drivers/clk/versatile/clk-icst.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
* We wrap the custom interface from <asm/hardware/icst.h> into the generic
* clock framework.
*
* Copyright (C) 2012 Linus Walleij
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* TODO: when all ARM reference designs are migrated to generic clocks, the
* ICST clock code from the ARM tree should probably be merged into this
* file.
Expand Down
10 changes: 9 additions & 1 deletion trunk/drivers/clk/versatile/clk-integrator.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
/*
* Clock driver for the ARM Integrator/AP and Integrator/CP boards
* Copyright (C) 2012 Linus Walleij
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/clk-provider.h>
#include <linux/clk.h>
#include <linux/clkdev.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/clk-provider.h>

#include <mach/hardware.h>
#include <mach/platform.h>
Expand Down
8 changes: 8 additions & 0 deletions trunk/drivers/clk/versatile/clk-realview.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/*
* Clock driver for the ARM RealView boards
* Copyright (C) 2012 Linus Walleij
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/clk.h>
#include <linux/clkdev.h>
#include <linux/err.h>
Expand Down

0 comments on commit 06fcb6e

Please sign in to comment.