diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/sh/kernel/clkdev.c | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/sh/kernel/clkdev.c')
| -rw-r--r-- | arch/sh/kernel/clkdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/clkdev.c b/arch/sh/kernel/clkdev.c index defdd6e30908..befc255830a4 100644 --- a/arch/sh/kernel/clkdev.c +++ b/arch/sh/kernel/clkdev.c | |||
| @@ -36,7 +36,7 @@ static DEFINE_MUTEX(clocks_mutex); | |||
| 36 | * If an entry has a device ID, it must match | 36 | * If an entry has a device ID, it must match |
| 37 | * If an entry has a connection ID, it must match | 37 | * If an entry has a connection ID, it must match |
| 38 | * Then we take the most specific entry - with the following | 38 | * Then we take the most specific entry - with the following |
| 39 | * order of precidence: dev+con > dev only > con only. | 39 | * order of precedence: dev+con > dev only > con only. |
| 40 | */ | 40 | */ |
| 41 | static struct clk *clk_find(const char *dev_id, const char *con_id) | 41 | static struct clk *clk_find(const char *dev_id, const char *con_id) |
| 42 | { | 42 | { |