diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /include/linux/acpi.h | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 84d3d9f034ce..d3bc25e6d27d 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -427,7 +427,8 @@ extern int acpi_mp_config; | |||
| 427 | extern struct acpi_table_mcfg_config *pci_mmcfg_config; | 427 | extern struct acpi_table_mcfg_config *pci_mmcfg_config; |
| 428 | extern int pci_mmcfg_config_num; | 428 | extern int pci_mmcfg_config_num; |
| 429 | 429 | ||
| 430 | extern int sbf_port ; | 430 | extern int sbf_port; |
| 431 | extern unsigned long acpi_video_flags; | ||
| 431 | 432 | ||
| 432 | #else /* !CONFIG_ACPI */ | 433 | #else /* !CONFIG_ACPI */ |
| 433 | 434 | ||