diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 17:41:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 17:41:36 -0400 |
commit | 47b816ff7d520509176154748713e7d66b3ad6ac (patch) | |
tree | 6d14e8bf3a8d41f9d4cdd6ccdec91d3d6b046b05 /drivers/tty | |
parent | 2e7580b0e75d771d93e24e681031a165b1d31071 (diff) | |
parent | 1ce447b90f3e71c81ae59e0062bc305ef267668b (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull a few more things for powerpc by Benjamin Herrenschmidt:
- Anton's did some recent improvements to EPOW event reporting on
pSeries (power supply failures and such). The patches are self
contained enough and replace really nasty code so I felt it should
still go in
- I did the vio driver registration change Greg requested, I don't see
the point of leaving that til the next merge window
- The remaining EEH changes I said were still pending to get rid of the
EEH references from the generic struct device_node
- A few more iSeries removal bits
- A perf bug fix on 970
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/perf: Fix instruction address sampling on 970 and Power4
powerpc+sparc/vio: Modernize driver registration
powerpc: Random little legacy iSeries removal tidy ups
powerpc: Remove NO_IRQ_IGNORE
powerpc/pseries: Cut down on enthusiastic use of defines in RAS code
powerpc/pseries: Clean up ras_error_interrupt code
powerpc/pseries: Remove RTAS_POWERMGM_EVENTS
powerpc/pseries: Use rtas_get_sensor in RAS code
powerpc/pseries: Parse and handle EPOW interrupts
powerpc: Make function that parses RTAS error logs global
powerpc/eeh: Retrieve PHB from global list
powerpc/eeh: Remove eeh information from pci_dn
powerpc/eeh: Remove eeh device from OF node
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/hvc/hvc_vio.c | 7 | ||||
-rw-r--r-- | drivers/tty/hvc/hvcs.c | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index 3a0d53d6368f..ee307799271a 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c | |||
@@ -310,11 +310,8 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev) | |||
310 | static struct vio_driver hvc_vio_driver = { | 310 | static struct vio_driver hvc_vio_driver = { |
311 | .id_table = hvc_driver_table, | 311 | .id_table = hvc_driver_table, |
312 | .probe = hvc_vio_probe, | 312 | .probe = hvc_vio_probe, |
313 | .remove = __devexit_p(hvc_vio_remove), | 313 | .remove = hvc_vio_remove, |
314 | .driver = { | 314 | .name = hvc_driver_name, |
315 | .name = hvc_driver_name, | ||
316 | .owner = THIS_MODULE, | ||
317 | } | ||
318 | }; | 315 | }; |
319 | 316 | ||
320 | static int __init hvc_vio_init(void) | 317 | static int __init hvc_vio_init(void) |
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c index d23759183b47..3436436fe2d7 100644 --- a/drivers/tty/hvc/hvcs.c +++ b/drivers/tty/hvc/hvcs.c | |||
@@ -879,10 +879,7 @@ static struct vio_driver hvcs_vio_driver = { | |||
879 | .id_table = hvcs_driver_table, | 879 | .id_table = hvcs_driver_table, |
880 | .probe = hvcs_probe, | 880 | .probe = hvcs_probe, |
881 | .remove = __devexit_p(hvcs_remove), | 881 | .remove = __devexit_p(hvcs_remove), |
882 | .driver = { | 882 | .name = hvcs_driver_name, |
883 | .name = hvcs_driver_name, | ||
884 | .owner = THIS_MODULE, | ||
885 | } | ||
886 | }; | 883 | }; |
887 | 884 | ||
888 | /* Only called from hvcs_get_pi please */ | 885 | /* Only called from hvcs_get_pi please */ |