diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 06:14:22 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 06:14:22 +0300 |
| commit | 647fb47dfabeffd2f1706013ebf5cfc92b70d273 (patch) | |
| tree | 267da299effc23a4594a190d1c842bd900b7517b /arch/ia64/sn/kernel/iomv.c | |
| parent | defad23020bb7701b3ad414135c73fc03054507b (diff) | |
| download | linux-647fb47dfabeffd2f1706013ebf5cfc92b70d273.tar.xz | |
ACPICA: reduce conflicts with Altix patch series
Syntax only -- no functional changes.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/iomv.c')
| -rw-r--r-- | arch/ia64/sn/kernel/iomv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c index b1a47da118b1..ab7e2fd40798 100644 --- a/arch/ia64/sn/kernel/iomv.c +++ b/arch/ia64/sn/kernel/iomv.c @@ -16,6 +16,7 @@ #include <asm/sn/pda.h> #include <asm/sn/sn_cpuid.h> #include <asm/sn/shub_mmr.h> +#include <asm/sn/acpi.h> #define IS_LEGACY_VGA_IOPORT(p) \ (((p) >= 0x3b0 && (p) <= 0x3bb) || ((p) >= 0x3c0 && (p) <= 0x3df)) @@ -29,8 +30,6 @@ * SN i/o address. Used by sn_in*() and sn_out*(). */ -extern int sn_acpi_base_support(); - void *sn_io_addr(unsigned long port) { if (!IS_RUNNING_ON_SIMULATOR()) { @@ -39,7 +38,7 @@ void *sn_io_addr(unsigned long port) /* On sn2, legacy I/O ports don't point at anything */ if (port < (64 * 1024)) return NULL; - if (sn_acpi_base_support()) + if (SN_ACPI_BASE_SUPPORT()) return (__ia64_mk_io_addr(port)); else return ((void *)(port | __IA64_UNCACHED_OFFSET)); |