On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > needed. Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. Thanks, Rafael > Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx> > Cc: linux-acpi@xxxxxxxxxxxxxxx > --- > drivers/acpi/apei/ghes.c | 2 +- > drivers/acpi/hed.c | 2 +- > drivers/acpi/pci_root.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index 1599566..73bca11 100644 > --- a/drivers/acpi/apei/ghes.c > +++ b/drivers/acpi/apei/ghes.c > @@ -901,7 +901,7 @@ static unsigned long ghes_esource_prealloc_size( > return prealloc_size; > } > > -static int __devinit ghes_probe(struct platform_device *ghes_dev) > +static int ghes_probe(struct platform_device *ghes_dev) > { > struct acpi_hest_generic *generic; > struct ghes *ghes = NULL; > diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c > index 20a0f2c..0ec28a3 100644 > --- a/drivers/acpi/hed.c > +++ b/drivers/acpi/hed.c > @@ -61,7 +61,7 @@ static void acpi_hed_notify(struct acpi_device *device, u32 event) > blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL); > } > > -static int __devinit acpi_hed_add(struct acpi_device *device) > +static int acpi_hed_add(struct acpi_device *device) > { > /* Only one hardware error device */ > if (hed_handle) > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index ab781f0..7928d4d 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -445,7 +445,7 @@ out: > } > EXPORT_SYMBOL(acpi_pci_osc_control_set); > > -static int __devinit acpi_pci_root_add(struct acpi_device *device) > +static int acpi_pci_root_add(struct acpi_device *device) > { > unsigned long long segment, bus; > acpi_status status; > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html