mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
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
This commit is contained in:
commit
47b816ff7d
38 changed files with 321 additions and 273 deletions
|
|
@ -310,11 +310,8 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
|
|||
static struct vio_driver hvc_vio_driver = {
|
||||
.id_table = hvc_driver_table,
|
||||
.probe = hvc_vio_probe,
|
||||
.remove = __devexit_p(hvc_vio_remove),
|
||||
.driver = {
|
||||
.name = hvc_driver_name,
|
||||
.owner = THIS_MODULE,
|
||||
}
|
||||
.remove = hvc_vio_remove,
|
||||
.name = hvc_driver_name,
|
||||
};
|
||||
|
||||
static int __init hvc_vio_init(void)
|
||||
|
|
|
|||
|
|
@ -879,10 +879,7 @@ static struct vio_driver hvcs_vio_driver = {
|
|||
.id_table = hvcs_driver_table,
|
||||
.probe = hvcs_probe,
|
||||
.remove = __devexit_p(hvcs_remove),
|
||||
.driver = {
|
||||
.name = hvcs_driver_name,
|
||||
.owner = THIS_MODULE,
|
||||
}
|
||||
.name = hvcs_driver_name,
|
||||
};
|
||||
|
||||
/* Only called from hvcs_get_pi please */
|
||||
|
|
|
|||
Loading…
Reference in a new issue