err.no Git - linux-2.6/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	e407dffd17dcb592e1605a2b3dbbb81f9f3cbc21
tree	83a23f97e9c15c328b4d6c2a7d7fd2aa6957cffb	tree \| snapshot
parent	5ed4273af8469ca4723d4bf1bcd3abe2cc792e9f	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
5d061e397db1 "x86, uv: update x86 mmr list for SGI uv".

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