Index: stable/12/sys/arm/conf/NOTES
===================================================================
--- stable/12/sys/arm/conf/NOTES	(revision 356852)
+++ stable/12/sys/arm/conf/NOTES	(revision 356853)
@@ -1,44 +1,48 @@
 # $FreeBSD$
 
 options 	FDT
 
 # Undo options from sys/conf/NOTES that we do not want...
 
 nooptions	COMPAT_FREEBSD4
 nooptions	COMPAT_FREEBSD5
 nooptions	COMPAT_FREEBSD6
 nooptions	COMPAT_FREEBSD7
 nooptions	COMPAT_FREEBSD9
 nooptions	PPC_PROBE_CHIPSET
 nooptions	MAXCPU		# value is set in machine/param.h
 
 # Devices in sys/conf/NOTES for which no such hardware exists on arm,
 # or the drivers don't compile...
 
 nodevice	fdc
 nodevice	sym
 
 nodevice	sc
 nodevice	blank_saver
 nodevice	daemon_saver
 nodevice	dragon_saver
 nodevice	fade_saver
 nodevice	fire_saver
 nodevice	green_saver
 nodevice	logo_saver
 nodevice	rain_saver
 nodevice	snake_saver
 nodevice	star_saver
 nodevice	warp_saver
 
 nodevice	ccr
 nodevice	cxgbe
 nodevice	cxgbev
 nodevice	snd_cmi
 
 nodevice	mpr
 nodevice	mps
 
 # Add devices which are specific to various arm platforms...
 
 device		twsi		# i2c controller on Marvel and Allwinner
+
+device		pl330		# ARM PL330 dma controller
+device		xdma		# xDMA framework for SoC on-chip dma controllers
+
Index: stable/12
===================================================================
--- stable/12	(revision 356852)
+++ stable/12	(revision 356853)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r356295