diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-07-13 11:05:50 +0200 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-07-13 11:05:50 +0200 |
| commit | 20697cb775bdd0271f3c90fad2d15c065fd19488 (patch) | |
| tree | 011ae1040fda8cf4a4bf660a523d7e9abf682597 /arch | |
| parent | [POWERPC] iseries: Remove unnecessary include of iseries/hv_lp_event.h (diff) | |
| parent | [POWERPC] Make the hvc_console output buffer size settable (diff) | |
| download | linux-20697cb775bdd0271f3c90fad2d15c065fd19488.tar.xz linux-20697cb775bdd0271f3c90fad2d15c065fd19488.zip | |
Merge branch 'hvc_iseries'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/iseries/Kconfig | 8 | ||||
| -rw-r--r-- | arch/powerpc/platforms/iseries/dt.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig index 3d957a30c8c2..887b68804e6d 100644 --- a/arch/powerpc/platforms/iseries/Kconfig +++ b/arch/powerpc/platforms/iseries/Kconfig @@ -3,13 +3,17 @@ menu "iSeries device drivers" depends on PPC_ISERIES config VIOCONS - tristate "iSeries Virtual Console Support" + tristate "iSeries Virtual Console Support (Obsolete)" + help + This is the old virtual console driver for legacy iSeries. + You should use the iSeries Hypervisor Virtual Console + support instead. config VIODASD tristate "iSeries Virtual I/O disk support" help If you are running on an iSeries system and you want to use - virtual disks created and managed by OS/400, say Y. + virtual disks created and managed by OS/400, say Y. config VIOCD tristate "iSeries Virtual I/O CD support" diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c index d194140c1ebf..894b534669d0 100644 --- a/arch/powerpc/platforms/iseries/dt.c +++ b/arch/powerpc/platforms/iseries/dt.c @@ -298,7 +298,8 @@ static void __init dt_vdevices(struct iseries_flat_dt *dt) dt_prop_u32(dt, "#address-cells", 1); dt_prop_u32(dt, "#size-cells", 0); - dt_do_vdevice(dt, "vty", reg, -1, device_type_serial, NULL, 1); + dt_do_vdevice(dt, "vty", reg, -1, device_type_serial, + "IBM,iSeries-vty", 1); reg++; dt_do_vdevice(dt, "v-scsi", reg, -1, device_type_vscsi, |