From 5206b4a83362a7725d46782cc81fe7dac300fcdb Mon Sep 17 00:00:00 2001
From: marcel <marcel@FreeBSD.org>
Date: Wed, 31 Mar 2010 05:05:28 +0000
Subject: MFC rev 199727, 200888, 201031, 202904, 203054, 203106, 203572,
 203884, 204183, 204184, 204185, 204425, 204904, 204905, 205172, 205234,
 205357, 205428, 205429, 205431, 205432, 205433, 205434, 205435, 205454,
 205665, 205713, 205723, 205726 and 205727:

Bring ia64 machine-dependent changes from 9-current to 8-stable.
---
 sys/modules/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'sys/modules')

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 9b7d550..cad745d 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -562,10 +562,7 @@ _zfs=		zfs
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"
-# Modules not enabled on ia64 (as compared to i386) include:
-#	aac acpi aout apm atspeaker drm ibcs2 linprocfs linux ncv
-#	nsp s3 sbni stg vesa
-# acpi is not enabled because it is broken as a module on ia64
+_aac=		aac
 _aic=		aic
 _an=		an
 _arcnet=	arcnet
@@ -578,12 +575,17 @@ _cm=		cm
 _cmx=		cmx
 _coff=		coff
 _cpufreq=	cpufreq
+_dpt=		dpt
 _em=		em
 _ep=		ep
+_et=		et
 _exca=		exca
 _fe=		fe
+_hptiop=	hptiop
+_ida=		ida
 _igb=		igb
 _iir=		iir
+_ips=		ips
 _mly=		mly
 _pccard=	pccard
 _scsi_low=	scsi_low
@@ -592,6 +594,7 @@ _sound=		sound
 _splash=	splash
 _sppp=		sppp
 _streams=	streams
+_twa=		twa
 _wi=		wi
 _xe=		xe
 .endif
-- 
cgit v1.1