diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 07:57:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 07:57:32 -0400 |
| commit | 975439fe73d1f0f7ce8c235c66783bd34dc459c3 (patch) | |
| tree | 84e29852d96283b13c6e603f86bd506a631343c5 /drivers/serial/sunzilog.c | |
| parent | ef31023743e66de7184e9aad432291c842a6384b (diff) | |
| parent | 129d6aba444d1e99d4cbfb9866a4652912426b65 (diff) | |
Merge branch 'x86/amd-iommu' into x86/urgent
Diffstat (limited to 'drivers/serial/sunzilog.c')
| -rw-r--r-- | drivers/serial/sunzilog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 0f3d69b86d67..3cb4c8aee13f 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
| @@ -32,11 +32,11 @@ | |||
| 32 | #include <linux/serio.h> | 32 | #include <linux/serio.h> |
| 33 | #endif | 33 | #endif |
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/of_device.h> | ||
| 35 | 36 | ||
| 36 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 37 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 38 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
| 39 | #include <asm/of_device.h> | ||
| 40 | 40 | ||
| 41 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 41 | #if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
| 42 | #define SUPPORT_SYSRQ | 42 | #define SUPPORT_SYSRQ |