diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 07:52:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 07:52:23 -0400 |
| commit | b9afa3e015273a52718e0a7efe198a0df76be880 (patch) | |
| tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db /drivers/block/xsysace.c | |
| parent | 144c7494239f12d554806439a17ad8203c7b2d3a (diff) | |
| parent | 763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/block/xsysace.c')
| -rw-r--r-- | drivers/block/xsysace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index 2982b3ee9465..057413bb16e2 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c | |||
| @@ -94,6 +94,7 @@ | |||
| 94 | #include <linux/hdreg.h> | 94 | #include <linux/hdreg.h> |
| 95 | #include <linux/platform_device.h> | 95 | #include <linux/platform_device.h> |
| 96 | #if defined(CONFIG_OF) | 96 | #if defined(CONFIG_OF) |
| 97 | #include <linux/of_address.h> | ||
| 97 | #include <linux/of_device.h> | 98 | #include <linux/of_device.h> |
| 98 | #include <linux/of_platform.h> | 99 | #include <linux/of_platform.h> |
| 99 | #endif | 100 | #endif |