diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
| commit | 3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch) | |
| tree | ab8a881a14478598a0c8bda0d26c62cdccfffd6d /drivers/char/viocons.c | |
| parent | 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff) | |
| parent | 9115a6c787596e687df03010d97fccc5e0762506 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'drivers/char/viocons.c')
| -rw-r--r-- | drivers/char/viocons.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index 44f5fb4a46ef..4d75c261f98a 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 26 | * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 27 | */ | 27 | */ |
| 28 | #include <linux/config.h> | 28 | #include <linux/config.h> |
| 29 | #include <linux/version.h> | ||
| 30 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 31 | #include <linux/proc_fs.h> | 30 | #include <linux/proc_fs.h> |
| 32 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| @@ -44,12 +43,12 @@ | |||
| 44 | #include <linux/tty_flip.h> | 43 | #include <linux/tty_flip.h> |
| 45 | #include <linux/sysrq.h> | 44 | #include <linux/sysrq.h> |
| 46 | 45 | ||
| 47 | #include <asm/iSeries/vio.h> | 46 | #include <asm/iseries/vio.h> |
| 48 | 47 | ||
| 49 | #include <asm/iSeries/HvLpEvent.h> | 48 | #include <asm/iseries/hv_lp_event.h> |
| 50 | #include <asm/iSeries/HvCallEvent.h> | 49 | #include <asm/iseries/hv_call_event.h> |
| 51 | #include <asm/iSeries/HvLpConfig.h> | 50 | #include <asm/iseries/hv_lp_config.h> |
| 52 | #include <asm/iSeries/HvCall.h> | 51 | #include <asm/iseries/hv_call.h> |
| 53 | 52 | ||
| 54 | #ifdef CONFIG_VT | 53 | #ifdef CONFIG_VT |
| 55 | #error You must turn off CONFIG_VT to use CONFIG_VIOCONS | 54 | #error You must turn off CONFIG_VT to use CONFIG_VIOCONS |