Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

[sfrench/cifs-2.6.git] / arch / ia64 / include / asm / machvec_hpzx1.h

diff --git a/arch/ia64/include/asm/machvec_hpzx1.h b/arch/ia64/include/asm/machvec_hpzx1.h
index 3bd83d78a412047099be119a2fa1b3094d767f47..5299ac38bfb6d018c959ce85896df46d79c2a8b9 100644 (file)
--- a/arch/ia64/include/asm/machvec_hpzx1.h
+++ b/arch/ia64/include/asm/machvec_hpzx1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MACHVEC_HPZX1_h
 #define _ASM_IA64_MACHVEC_HPZX1_h
 
@@ -11,7 +12,7 @@ extern ia64_mv_dma_init                       sba_dma_init;
  * platform's machvec structure.  When compiling a non-generic kernel,
  * the macros are used directly.
  */
-#define platform_name                          "hpzx1"
+#define ia64_platform_name                     "hpzx1"
 #define platform_setup                         dig_setup
 #define platform_dma_init                      sba_dma_init