diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/char/hvc_console.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/char/hvc_console.c')
| -rw-r--r-- | drivers/char/hvc_console.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index a5c6a9d7ff08..6e380aecea6a 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
| @@ -820,7 +820,6 @@ int __init hvc_init(void) | |||
| 820 | return -ENOMEM; | 820 | return -ENOMEM; |
| 821 | 821 | ||
| 822 | drv->owner = THIS_MODULE; | 822 | drv->owner = THIS_MODULE; |
| 823 | drv->devfs_name = "hvc/"; | ||
| 824 | drv->driver_name = "hvc"; | 823 | drv->driver_name = "hvc"; |
| 825 | drv->name = "hvc"; | 824 | drv->name = "hvc"; |
| 826 | drv->major = HVC_MAJOR; | 825 | drv->major = HVC_MAJOR; |