diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:49:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-27 11:49:05 -0500 |
| commit | cccc65a3b60edaf721cdee5a14f68ba009341822 (patch) | |
| tree | a458d28f70cbe0e848596aad6005442a2621d388 /include/linux/acpi.h | |
| parent | ba70d0614728892b86b2be2f7eae0c696b436461 (diff) | |
| parent | e95a9ec1bb66e07b138861c743192f06e7b3e4de (diff) | |
Merge branch 'master'
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 | ||