Add patches accepted for 2.6.29-rc2
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.29-rc2 / 0001-ACPI-remove-private-acpica-headers-from-driver-file.patch
blobfd09bd818cd3c573eb1f6c97f55d1c2c07adb0a0
1 From ea7e96e0f2277107d9ea14c3f16c86ba82b2e560 Mon Sep 17 00:00:00 2001
2 From: Lin Ming <ming.m.lin@intel.com>
3 Date: Tue, 16 Dec 2008 16:28:17 +0800
4 Subject: ACPI: remove private acpica headers from driver files
6 External driver files should not include any private acpica headers.
8 Signed-off-by: Lin Ming <ming.m.lin@intel.com>
9 Signed-off-by: Len Brown <len.brown@intel.com>
10 ---
11 arch/ia64/include/asm/acpi-ext.h | 1 -
12 arch/ia64/include/asm/sn/acpi.h | 2 --
13 arch/ia64/sn/kernel/io_acpi_init.c | 1 -
14 arch/ia64/sn/kernel/io_common.c | 1 -
15 drivers/acpi/cm_sbs.c | 3 ---
16 drivers/acpi/debug.c | 1 -
17 drivers/acpi/ec.c | 1 -
18 drivers/acpi/numa.c | 1 -
19 drivers/acpi/sbshc.c | 1 -
20 drivers/acpi/scan.c | 1 -
21 drivers/acpi/sleep/wakeup.c | 1 -
22 drivers/ata/libata-acpi.c | 6 ------
23 drivers/ata/pata_acpi.c | 6 ------
24 drivers/char/tpm/tpm_bios.c | 2 --
25 drivers/ide/ide-acpi.c | 6 ------
26 drivers/misc/tc1100-wmi.c | 1 -
27 drivers/misc/thinkpad_acpi.c | 1 -
28 drivers/pci/hotplug/acpi_pcihp.c | 1 -
29 drivers/pci/hotplug/pciehp.h | 1 -
30 drivers/pci/pci-acpi.c | 2 --
31 drivers/pnp/pnpacpi/core.c | 1 -
32 include/linux/pci_hotplug.h | 1 -
33 22 files changed, 0 insertions(+), 42 deletions(-)
35 diff --git a/arch/ia64/include/asm/acpi-ext.h b/arch/ia64/include/asm/acpi-ext.h
36 index 734d137..7f8362b 100644
37 --- a/arch/ia64/include/asm/acpi-ext.h
38 +++ b/arch/ia64/include/asm/acpi-ext.h
39 @@ -14,7 +14,6 @@
40 #define _ASM_IA64_ACPI_EXT_H
42 #include <linux/types.h>
43 -#include <acpi/actypes.h>
45 extern acpi_status hp_acpi_csr_space (acpi_handle, u64 *base, u64 *length);
47 diff --git a/arch/ia64/include/asm/sn/acpi.h b/arch/ia64/include/asm/sn/acpi.h
48 index 9ce2801..fd480db 100644
49 --- a/arch/ia64/include/asm/sn/acpi.h
50 +++ b/arch/ia64/include/asm/sn/acpi.h
51 @@ -9,8 +9,6 @@
52 #ifndef _ASM_IA64_SN_ACPI_H
53 #define _ASM_IA64_SN_ACPI_H
55 -#include "acpi/acglobal.h"
57 extern int sn_acpi_rev;
58 #define SN_ACPI_BASE_SUPPORT() (sn_acpi_rev >= 0x20101)
60 diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
61 index 4c8bc8e..c5a2140 100644
62 --- a/arch/ia64/sn/kernel/io_acpi_init.c
63 +++ b/arch/ia64/sn/kernel/io_acpi_init.c
64 @@ -13,7 +13,6 @@
65 #include <asm/sn/sn_sal.h>
66 #include "xtalk/hubdev.h"
67 #include <linux/acpi.h>
68 -#include <acpi/acnamesp.h>
72 diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
73 index e1917ed..0d4ffa4 100644
74 --- a/arch/ia64/sn/kernel/io_common.c
75 +++ b/arch/ia64/sn/kernel/io_common.c
76 @@ -26,7 +26,6 @@
77 #include <linux/acpi.h>
78 #include <asm/sn/sn2/sn_hwperf.h>
79 #include <asm/sn/acpi.h>
80 -#include "acpi/acglobal.h"
82 extern void sn_init_cpei_timer(void);
83 extern void register_sn_procfs(void);
84 diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c
85 index 307963b..332fe4b 100644
86 --- a/drivers/acpi/cm_sbs.c
87 +++ b/drivers/acpi/cm_sbs.c
88 @@ -27,9 +27,6 @@
89 #include <linux/seq_file.h>
90 #include <acpi/acpi_bus.h>
91 #include <acpi/acpi_drivers.h>
92 -#include <acpi/acmacros.h>
93 -#include <acpi/actypes.h>
94 -#include <acpi/acutils.h>
96 ACPI_MODULE_NAME("cm_sbs");
97 #define ACPI_AC_CLASS "ac_adapter"
98 diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c
99 index c483968..20223cb 100644
100 --- a/drivers/acpi/debug.c
101 +++ b/drivers/acpi/debug.c
102 @@ -9,7 +9,6 @@
103 #include <linux/moduleparam.h>
104 #include <asm/uaccess.h>
105 #include <acpi/acpi_drivers.h>
106 -#include <acpi/acglobal.h>
108 #define _COMPONENT ACPI_SYSTEM_COMPONENT
109 ACPI_MODULE_NAME("debug");
110 diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
111 index 2cbc2c9..3105e04 100644
112 --- a/drivers/acpi/ec.c
113 +++ b/drivers/acpi/ec.c
114 @@ -42,7 +42,6 @@
115 #include <asm/io.h>
116 #include <acpi/acpi_bus.h>
117 #include <acpi/acpi_drivers.h>
118 -#include <acpi/actypes.h>
120 #define ACPI_EC_CLASS "embedded_controller"
121 #define ACPI_EC_DEVICE_NAME "Embedded Controller"
122 diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
123 index 25ceae9..c5e292a 100644
124 --- a/drivers/acpi/numa.c
125 +++ b/drivers/acpi/numa.c
126 @@ -29,7 +29,6 @@
127 #include <linux/errno.h>
128 #include <linux/acpi.h>
129 #include <acpi/acpi_bus.h>
130 -#include <acpi/acmacros.h>
132 #define ACPI_NUMA 0x80000000
133 #define _COMPONENT ACPI_NUMA
134 diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
135 index e53e590..0619734 100644
136 --- a/drivers/acpi/sbshc.c
137 +++ b/drivers/acpi/sbshc.c
138 @@ -10,7 +10,6 @@
140 #include <acpi/acpi_bus.h>
141 #include <acpi/acpi_drivers.h>
142 -#include <acpi/actypes.h>
143 #include <linux/wait.h>
144 #include <linux/delay.h>
145 #include <linux/interrupt.h>
146 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
147 index 39b7233..c54d7b6 100644
148 --- a/drivers/acpi/scan.c
149 +++ b/drivers/acpi/scan.c
150 @@ -10,7 +10,6 @@
151 #include <linux/kthread.h>
153 #include <acpi/acpi_drivers.h>
154 -#include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */
156 #define _COMPONENT ACPI_BUS_COMPONENT
157 ACPI_MODULE_NAME("scan");
158 diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
159 index db325c2..2d34806 100644
160 --- a/drivers/acpi/sleep/wakeup.c
161 +++ b/drivers/acpi/sleep/wakeup.c
162 @@ -8,7 +8,6 @@
163 #include <acpi/acpi_drivers.h>
164 #include <linux/kernel.h>
165 #include <linux/types.h>
166 -#include <acpi/acevents.h>
167 #include "sleep.h"
169 #define _COMPONENT ACPI_SYSTEM_COMPONENT
170 diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
171 index c012307..246987f 100644
172 --- a/drivers/ata/libata-acpi.c
173 +++ b/drivers/ata/libata-acpi.c
174 @@ -19,12 +19,6 @@
175 #include "libata.h"
177 #include <acpi/acpi_bus.h>
178 -#include <acpi/acnames.h>
179 -#include <acpi/acnamesp.h>
180 -#include <acpi/acparser.h>
181 -#include <acpi/acexcep.h>
182 -#include <acpi/acmacros.h>
183 -#include <acpi/actypes.h>
185 enum {
186 ATA_ACPI_FILTER_SETXFER = 1 << 0,
187 diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
188 index e2e332d..8b77a98 100644
189 --- a/drivers/ata/pata_acpi.c
190 +++ b/drivers/ata/pata_acpi.c
191 @@ -13,12 +13,6 @@
192 #include <linux/device.h>
193 #include <scsi/scsi_host.h>
194 #include <acpi/acpi_bus.h>
195 -#include <acpi/acnames.h>
196 -#include <acpi/acnamesp.h>
197 -#include <acpi/acparser.h>
198 -#include <acpi/acexcep.h>
199 -#include <acpi/acmacros.h>
200 -#include <acpi/actypes.h>
202 #include <linux/libata.h>
203 #include <linux/ata.h>
204 diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
205 index 68f052b..ed306eb 100644
206 --- a/drivers/char/tpm/tpm_bios.c
207 +++ b/drivers/char/tpm/tpm_bios.c
208 @@ -23,8 +23,6 @@
209 #include <linux/security.h>
210 #include <linux/module.h>
211 #include <acpi/acpi.h>
212 -#include <acpi/actypes.h>
213 -#include <acpi/actbl.h>
214 #include "tpm.h"
216 #define TCG_EVENT_NAME_LEN_MAX 255
217 diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
218 index 244a8a0..9e8d52a 100644
219 --- a/drivers/ide/ide-acpi.c
220 +++ b/drivers/ide/ide-acpi.c
221 @@ -18,12 +18,6 @@
222 #include <linux/dmi.h>
224 #include <acpi/acpi_bus.h>
225 -#include <acpi/acnames.h>
226 -#include <acpi/acnamesp.h>
227 -#include <acpi/acparser.h>
228 -#include <acpi/acexcep.h>
229 -#include <acpi/acmacros.h>
230 -#include <acpi/actypes.h>
232 #define REGS_PER_GTF 7
233 struct taskfile_array {
234 diff --git a/drivers/misc/tc1100-wmi.c b/drivers/misc/tc1100-wmi.c
235 index f25e4c9..b4a4aa9 100644
236 --- a/drivers/misc/tc1100-wmi.c
237 +++ b/drivers/misc/tc1100-wmi.c
238 @@ -30,7 +30,6 @@
239 #include <linux/init.h>
240 #include <linux/types.h>
241 #include <acpi/acpi.h>
242 -#include <acpi/actypes.h>
243 #include <acpi/acpi_bus.h>
244 #include <acpi/acpi_drivers.h>
245 #include <linux/platform_device.h>
246 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
247 index 899766e..3478453 100644
248 --- a/drivers/misc/thinkpad_acpi.c
249 +++ b/drivers/misc/thinkpad_acpi.c
250 @@ -76,7 +76,6 @@
251 #include <linux/workqueue.h>
253 #include <acpi/acpi_drivers.h>
254 -#include <acpi/acnamesp.h>
256 #include <linux/pci_ids.h>
258 diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
259 index e17ef54..2c981cb 100644
260 --- a/drivers/pci/hotplug/acpi_pcihp.c
261 +++ b/drivers/pci/hotplug/acpi_pcihp.c
262 @@ -33,7 +33,6 @@
263 #include <linux/pci-acpi.h>
264 #include <acpi/acpi.h>
265 #include <acpi/acpi_bus.h>
266 -#include <acpi/actypes.h>
268 #define MY_NAME "acpi_pcihp"
270 diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
271 index b2801a7..7072952 100644
272 --- a/drivers/pci/hotplug/pciehp.h
273 +++ b/drivers/pci/hotplug/pciehp.h
274 @@ -217,7 +217,6 @@ struct hpc_ops {
275 #ifdef CONFIG_ACPI
276 #include <acpi/acpi.h>
277 #include <acpi/acpi_bus.h>
278 -#include <acpi/actypes.h>
279 #include <linux/pci-acpi.h>
281 static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
282 diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
283 index ae5ec76..9d976d5 100644
284 --- a/drivers/pci/pci-acpi.c
285 +++ b/drivers/pci/pci-acpi.c
286 @@ -13,8 +13,6 @@
287 #include <linux/module.h>
288 #include <linux/pci-aspm.h>
289 #include <acpi/acpi.h>
290 -#include <acpi/acnamesp.h>
291 -#include <acpi/acresrc.h>
292 #include <acpi/acpi_bus.h>
294 #include <linux/pci-acpi.h>
295 diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
296 index 383e47c..2834846 100644
297 --- a/drivers/pnp/pnpacpi/core.c
298 +++ b/drivers/pnp/pnpacpi/core.c
299 @@ -23,7 +23,6 @@
300 #include <linux/pnp.h>
301 #include <linux/mod_devicetable.h>
302 #include <acpi/acpi_bus.h>
303 -#include <acpi/actypes.h>
305 #include "../base.h"
306 #include "pnpacpi.h"
307 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
308 index a00bd1a..c2d1a7d 100644
309 --- a/include/linux/pci_hotplug.h
310 +++ b/include/linux/pci_hotplug.h
311 @@ -223,7 +223,6 @@ struct hotplug_params {
312 #ifdef CONFIG_ACPI
313 #include <acpi/acpi.h>
314 #include <acpi/acpi_bus.h>
315 -#include <acpi/actypes.h>
316 extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
317 struct hotplug_params *hpp);
318 int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags);
320 1.5.6.5