diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /drivers/clocksource | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 1 | ||||
| -rw-r--r-- | drivers/clocksource/sh_mtu2.c | 1 | ||||
| -rw-r--r-- | drivers/clocksource/sh_tmu.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 578595c4425d..744f748cc84b 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/clocksource.h> | 29 | #include <linux/clocksource.h> |
| 30 | #include <linux/clockchips.h> | 30 | #include <linux/clockchips.h> |
| 31 | #include <linux/sh_timer.h> | 31 | #include <linux/sh_timer.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | struct sh_cmt_priv { | 34 | struct sh_cmt_priv { |
| 34 | void __iomem *mapbase; | 35 | void __iomem *mapbase; |
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c index 4c8a759e60cd..5fb78bfd73bb 100644 --- a/drivers/clocksource/sh_mtu2.c +++ b/drivers/clocksource/sh_mtu2.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 30 | #include <linux/clockchips.h> | 30 | #include <linux/clockchips.h> |
| 31 | #include <linux/sh_timer.h> | 31 | #include <linux/sh_timer.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | struct sh_mtu2_priv { | 34 | struct sh_mtu2_priv { |
| 34 | void __iomem *mapbase; | 35 | void __iomem *mapbase; |
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 961f5b5ef6a3..fc9ff1e5b770 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/clocksource.h> | 30 | #include <linux/clocksource.h> |
| 31 | #include <linux/clockchips.h> | 31 | #include <linux/clockchips.h> |
| 32 | #include <linux/sh_timer.h> | 32 | #include <linux/sh_timer.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | struct sh_tmu_priv { | 35 | struct sh_tmu_priv { |
| 35 | void __iomem *mapbase; | 36 | void __iomem *mapbase; |