PERFORCE change 40895 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=40895

Change 40895 by peter at peter_daintree on 2003/10/30 15:38:50

	fix merge conflict

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/apicvar.h#7 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/include/apicvar.h#7 (text+ko) ====

@@ -162,7 +162,6 @@
 int	lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi);
 int	lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger);
 void	lapic_setup(void);
-void	lapic_disable(void);
 
 #endif /* !LOCORE */
 #endif /* _MACHINE_APICVAR_H_ */