diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 15:06:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 15:06:00 -0400 |
| commit | 8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0 (patch) | |
| tree | 4f5f771f66a9b223b116742a8a04019cad287a4f /drivers/rtc | |
| parent | 93416253073511716f7e70c06e32c3810c3deac4 (diff) | |
| parent | e0fb8c418520b41d57667befdb8861c46cdf69e0 (diff) | |
Merge branch 'fixes' of ssh://master.kernel.org/~sfr/next-fixes
* 'fixes' of ssh://master.kernel.org/~sfr/next-fixes:
acpi: update gfp/slab.h includes
ocfs2: update gfp/slab.h includes
davinci: update gfp/slab.h includes
arm: update gfp/slab.h includes
v4l-dvb: update gfp/slab.h includes
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-davinci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 92a8f6cacda9..34647fc1ee98 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/bcd.h> | 29 | #include <linux/bcd.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | /* | 34 | /* |
| 34 | * The DaVinci RTC is a simple RTC with the following | 35 | * The DaVinci RTC is a simple RTC with the following |