diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/char/rtc.c | |
| parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
| parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
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 |