diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /include/linux/sm501.h | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/sm501.h')
| -rw-r--r-- | include/linux/sm501.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sm501.h b/include/linux/sm501.h index 932a9efee8a5..bca134544700 100644 --- a/include/linux/sm501.h +++ b/include/linux/sm501.h | |||
| @@ -24,7 +24,8 @@ extern int sm501_unit_power(struct device *dev, | |||
| 24 | extern unsigned long sm501_set_clock(struct device *dev, | 24 | extern unsigned long sm501_set_clock(struct device *dev, |
| 25 | int clksrc, unsigned long freq); | 25 | int clksrc, unsigned long freq); |
| 26 | 26 | ||
| 27 | extern unsigned long sm501_find_clock(int clksrc, unsigned long req_freq); | 27 | extern unsigned long sm501_find_clock(struct device *dev, |
| 28 | int clksrc, unsigned long req_freq); | ||
| 28 | 29 | ||
| 29 | /* sm501_misc_control | 30 | /* sm501_misc_control |
| 30 | * | 31 | * |