===================================================================
RCS file: /cvs/sys/arch/arm/sa11x0/files.sa11x1,v
retrieving revision 1.1.1.1
retrieving revision 1.4
diff -u -r1.1.1.1 -r1.4
--- sys/arch/arm/sa11x0/files.sa11x1	2008/03/04 16:05:18	1.1.1.1
+++ sys/arch/arm/sa11x0/files.sa11x1	2008/05/11 10:26:11	1.4
@@ -1,18 +1,29 @@
-#	$OpenBSD: files.sa11x1,v 1.1.1.1 2008/03/04 16:05:18 nbrk Exp $
+#	$OpenBSD: files.sa11x1,v 1.4 2008/05/11 09:26:11 nbrk Exp $
 #
 # Configuration info for Intel StrongARM SA11[01]1 companion chip
 #
 
 # SA11[01]1 integrated peripherals.
-define	sacc {[addr=-1], [size=0], [intr=-1]}
+define	sacc {[xintr=-1]}
 device	sacc
 attach	sacc at saip
 file	arch/arm/sa11x0/sa1111.c
 file	arch/arm/sa11x0/sa11x1_space.c
 
+# SA-1111 Interrupt Controller
+device	sacic
+attach	sacic at sacc
+file	arch/arm/sa11x0/sa1111_intr.c	sacic
+
+# SA-1111 GPIO controller
+device	sacgpio
+attach	sacgpio at sacc
+file	arch/arm/sa11x0/sa1111_gpio.c	sacgpio
+
 # PCMCIA
-#device	saccpcic: pcmciabus
-#file	arch/arm/sa11x0/sa11xx_pcic.c
+device	sacpcic: pcmciabus
+file	arch/arm/sa11x0/sa11xx_pcic.c	sacpcic
+file	arch/arm/sa11x0/sa11x1_pcic.c	sacpcic
 # XXX
-#device	fdc
+device	fdc