diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 00:22:19 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 00:22:19 +0400 |
| commit | 6d8a97af63222c5cbc7fe63ae19345e74e153e90 (patch) | |
| tree | 4b3e286c1f68bece1e839ae63f5c659711cae47d /arch/ia64/include/asm/machvec_sn2.h | |
| parent | f6bcfc9dd48d305211283b7f7d55e3779a2f661b (diff) | |
| parent | a119365586b0130dfea06457f584953e0ff6481d (diff) | |
| download | linux-6d8a97af63222c5cbc7fe63ae19345e74e153e90.tar.xz | |
Merge tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull misc ia64 build fixes from Tony Luck.
* tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
[IA64] Rename platform_name to ia64_platform_name
[IA64] Mark PARAVIRT and KVM as broken
Diffstat (limited to 'arch/ia64/include/asm/machvec_sn2.h')
| -rw-r--r-- | arch/ia64/include/asm/machvec_sn2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/machvec_sn2.h b/arch/ia64/include/asm/machvec_sn2.h index f061a30aac42..ece9fa85be88 100644 --- a/arch/ia64/include/asm/machvec_sn2.h +++ b/arch/ia64/include/asm/machvec_sn2.h @@ -71,7 +71,7 @@ extern ia64_mv_pci_fixup_bus_t sn_pci_fixup_bus; * platform's machvec structure. When compiling a non-generic kernel, * the macros are used directly. */ -#define platform_name "sn2" +#define ia64_platform_name "sn2" #define platform_setup sn_setup #define platform_cpu_init sn_cpu_init #define platform_irq_init sn_irq_init |