diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/sh | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/cpu/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index 83da5debeedf..e9fa1bfed53e 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c | |||
| @@ -404,7 +404,7 @@ EXPORT_SYMBOL_GPL(clk_round_rate); | |||
| 404 | * If an entry has a device ID, it must match | 404 | * If an entry has a device ID, it must match |
| 405 | * If an entry has a connection ID, it must match | 405 | * If an entry has a connection ID, it must match |
| 406 | * Then we take the most specific entry - with the following | 406 | * Then we take the most specific entry - with the following |
| 407 | * order of precidence: dev+con > dev only > con only. | 407 | * order of precedence: dev+con > dev only > con only. |
| 408 | */ | 408 | */ |
| 409 | static struct clk *clk_find(const char *dev_id, const char *con_id) | 409 | static struct clk *clk_find(const char *dev_id, const char *con_id) |
| 410 | { | 410 | { |