diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/char/rtc.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/char/rtc.c')
| -rw-r--r-- | drivers/char/rtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 95acb8c880f4..dfa8b3062fda 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
| @@ -961,7 +961,7 @@ static int __init rtc_init(void) | |||
| 961 | #endif | 961 | #endif |
| 962 | #ifdef CONFIG_SPARC32 | 962 | #ifdef CONFIG_SPARC32 |
| 963 | struct device_node *ebus_dp; | 963 | struct device_node *ebus_dp; |
| 964 | struct of_device *op; | 964 | struct platform_device *op; |
| 965 | #else | 965 | #else |
| 966 | void *r; | 966 | void *r; |
| 967 | #ifdef RTC_IRQ | 967 | #ifdef RTC_IRQ |