Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9445a38 authored by Fengguang Wu's avatar Fengguang Wu Committed by Tony Luck
Browse files

[IA64] Rename platform_name to ia64_platform_name 



The macro name is too generic and conflicts with
snd_soc_dai_link.platform_name, which triggers lots of build errors.

Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0c406643

arch/ia64/include/asm/machvec.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); 
# ifdef MACHVEC_PLATFORM_HEADER

#  include MACHVEC_PLATFORM_HEADER

# else

#  define platform_name		ia64_mv.name

#  define ia64_platform_name	ia64_mv.name

#  define platform_setup	ia64_mv.setup

#  define platform_cpu_init	ia64_mv.cpu_init

#  define platform_irq_init	ia64_mv.irq_init

arch/ia64/include/asm/machvec_dig.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ extern ia64_mv_setup_t dig_setup; 
 * platform's machvec structure.  When compiling a non-generic kernel,

 * the macros are used directly.

 */

#define platform_name		"dig"

#define ia64_platform_name	"dig"

#define platform_setup		dig_setup



#endif /* _ASM_IA64_MACHVEC_DIG_h */

arch/ia64/include/asm/machvec_dig_vtd.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ extern ia64_mv_dma_init pci_iommu_alloc; 
 * platform's machvec structure.  When compiling a non-generic kernel,

 * the macros are used directly.

 */

#define platform_name				"dig_vtd"

#define ia64_platform_name			"dig_vtd"

#define platform_setup				dig_setup

#define platform_dma_init			pci_iommu_alloc

arch/ia64/include/asm/machvec_hpsim.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ extern ia64_mv_irq_init_t hpsim_irq_init; 
 * platform's machvec structure.  When compiling a non-generic kernel,

 * the macros are used directly.

 */

#define platform_name		"hpsim"

#define ia64_platform_name	"hpsim"

#define platform_setup		hpsim_setup

#define platform_irq_init	hpsim_irq_init

arch/ia64/include/asm/machvec_hpzx1.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,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