git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.34-rc6'
[pandora-kernel.git]
/
include
/
acpi
/
acrestyp.h
diff --git
a/include/acpi/acrestyp.h
b/include/acpi/acrestyp.h
index
9ffe00f
..
e552635
100644
(file)
--- a/
include/acpi/acrestyp.h
+++ b/
include/acpi/acrestyp.h
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 20
08
, Intel Corp.
+ * Copyright (C) 2000 - 20
10
, 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
@@
-397,7
+397,7
@@
struct acpi_resource {
struct acpi_pci_routing_table {
u32 length;
u32 pin;
struct acpi_pci_routing_table {
u32 length;
u32 pin;
-
acpi_integer address;
/* here for 64-bit alignment */
+
u64 address;
/* here for 64-bit alignment */
u32 source_index;
char source[4]; /* pad to 64 bits so sizeof() works in all cases */
};
u32 source_index;
char source[4]; /* pad to 64 bits so sizeof() works in all cases */
};