git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
acpica
/
dsinit.c
diff --git
a/drivers/acpi/acpica/dsinit.c
b/drivers/acpi/acpica/dsinit.c
index c1d8af8a8aaf19a66de381761509d3662b048cf6..f1e6dcc7a8271c6527e954299774841e5f4eaf78 100644
(file)
--- a/
drivers/acpi/acpica/dsinit.c
+++ b/
drivers/acpi/acpica/dsinit.c
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 201
5
, Intel Corp.
+ * Copyright (C) 2000 - 201
6
, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-188,7
+188,7
@@
acpi_ds_init_one_object(acpi_handle obj_handle,
acpi_status
acpi_ds_initialize_objects(u32 table_index,
acpi_status
acpi_ds_initialize_objects(u32 table_index,
- struct acpi_namespace_node *
start_node)
+ struct acpi_namespace_node *start_node)
{
acpi_status status;
struct acpi_init_walk_info info;
{
acpi_status status;
struct acpi_init_walk_info info;