diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-18 15:56:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 15:56:47 -0400 |
| commit | 8bc84f87315e8bdbe242ba788fdc6a74d653b177 (patch) | |
| tree | b96fef5c82de40cb2a5bfe6f29699f1c820513cd /drivers/net/irda/sh_irda.c | |
| parent | 18e5a45db30e0e338cdd663eda05a8288cc14fa5 (diff) | |
| parent | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: add the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/irda/sh_irda.c')
| -rw-r--r-- | drivers/net/irda/sh_irda.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c index 4488bd581eca..82660672dcd9 100644 --- a/drivers/net/irda/sh_irda.c +++ b/drivers/net/irda/sh_irda.c | |||
| @@ -22,6 +22,8 @@ | |||
| 22 | * - DMA transfer support | 22 | * - DMA transfer support |
| 23 | * - FIFO mode support | 23 | * - FIFO mode support |
| 24 | */ | 24 | */ |
| 25 | #include <linux/io.h> | ||
| 26 | #include <linux/interrupt.h> | ||
| 25 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 26 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 27 | #include <linux/clk.h> | 29 | #include <linux/clk.h> |