Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 336932
b: refs/heads/master
c: da095fd
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent 54bad27 commit 2296e41
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 15856ad50bf5ea02a5ee22399c036d49e7e1124d
refs/heads/master: da095fd3d5063f2dd03468d71f7df39a0430d86f
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/apei/ghes.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/hed.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/pci_root.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2296e41

Please sign in to comment.