git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@elte.hu>
	Wed, 9 Jul 2008 06:00:15 +0000 (08:00 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 9 Jul 2008 06:18:41 +0000 (08:18 +0200)
commit	eb9dc5d0a8dc8a7411c288716fe621f93a47ae9a
tree	83a23f97e9c15c328b4d6c2a7d7fd2aa6957cffb	tree \| snapshot
parent	9f414a9647797f6027d5d4ea6f936111b575d3ec	commit \| diff

x86, uv: build fix for "x86, uv: update x86 mmr list for SGI uv"

fix:

In file included from arch/x86/kernel/genx2apic_uv_x.c:25:
include/asm/uv/uv_mmrs.h:986: error: redefinition of ‘union uvh_rh_gam_cfg_overlay_config_mmr_u’
include/asm/uv/uv_mmrs.h:988: error: redefinition of ‘struct uvh_rh_gam_cfg_overlay_config_mmr_s’
include/asm/uv/uv_mmrs.h:1064: error: redefinition of ‘union uvh_rh_gam_mmioh_overlay_config_mmr_u’
include/asm/uv/uv_mmrs.h:1066: error: redefinition of ‘struct uvh_rh_gam_mmioh_overlay_config_mmr_s’

caused by duplicate section (cut & paste error) in commit
ac000f351fe8 "x86, uv: update x86 mmr list for SGI uv".

Signed-off-by: Ingo Molnar <mingo@elte.hu>