Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7843
b: refs/heads/master
c: 8713cbe
h: refs/heads/master
i:
  7841: 4a15bea
  7839: 81ae656
v: v3
  • Loading branch information
Adrian Bunk authored and Len Brown committed Sep 3, 2005
1 parent dd861f0 commit d3bc735
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 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: aff8c2777d1a9edf97f26bf60579f9c931443eb1
refs/heads/master: 8713cbefafbb5a101ade541a4b0ffa108bf697cc
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/osl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ static int __init acpi_wake_gpes_always_on_setup(char *str)

__setup("acpi_wake_gpes_always_on", acpi_wake_gpes_always_on_setup);

int __init acpi_hotkey_setup(char *str)
static int __init acpi_hotkey_setup(char *str)
{
acpi_specific_hotkey_enabled = FALSE;
return 1;
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/acpi/pci_bind.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ struct acpi_pci_data {
struct pci_dev *dev;
};

void acpi_pci_data_handler(acpi_handle handle, u32 function, void *context)
static void acpi_pci_data_handler(acpi_handle handle, u32 function,
void *context)
{
ACPI_FUNCTION_TRACE("acpi_pci_data_handler");

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/processor_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)
return_VALUE(0);
}

int acpi_processor_errata(struct acpi_processor *pr)
static int acpi_processor_errata(struct acpi_processor *pr)
{
int result = 0;
struct pci_dev *dev = NULL;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ acpi_bus_driver_init(struct acpi_device *device, struct acpi_driver *driver)
return_VALUE(0);
}

int acpi_start_single_object(struct acpi_device *device)
static int acpi_start_single_object(struct acpi_device *device)
{
int result = 0;
struct acpi_driver *driver;
Expand Down

0 comments on commit d3bc735

Please sign in to comment.