From 2296e411e1f67208f3ba1495da752b9215da50b8 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:46 -0500
Subject: [PATCH] --- yaml --- r: 336932 b: refs/heads/master c:
 da095fd3d5063f2dd03468d71f7df39a0430d86f h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/acpi/apei/ghes.c | 2 +-
 trunk/drivers/acpi/hed.c       | 2 +-
 trunk/drivers/acpi/pci_root.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b819a7ce4d7b..52bec2b5b769 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15856ad50bf5ea02a5ee22399c036d49e7e1124d
+refs/heads/master: da095fd3d5063f2dd03468d71f7df39a0430d86f
diff --git a/trunk/drivers/acpi/apei/ghes.c b/trunk/drivers/acpi/apei/ghes.c
index 1599566ed1fe..73bca1141fa7 100644
--- a/trunk/drivers/acpi/apei/ghes.c
+++ b/trunk/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/trunk/drivers/acpi/hed.c b/trunk/drivers/acpi/hed.c
index 20a0f2c3ca3b..0ec28a38f607 100644
--- a/trunk/drivers/acpi/hed.c
+++ b/trunk/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/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c
index bce469c0b48a..f70b9e5fc1b5 100644
--- a/trunk/drivers/acpi/pci_root.c
+++ b/trunk/drivers/acpi/pci_root.c
@@ -445,7 +445,7 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)
 }
 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;