Index: stable/11/sys/arm/conf/NOTES
===================================================================
--- stable/11/sys/arm/conf/NOTES	(revision 345664)
+++ stable/11/sys/arm/conf/NOTES	(revision 345665)
@@ -1,104 +1,105 @@
 # $FreeBSD$
 
 machine	arm
 
 cpu	CPU_ARM9
 cpu	CPU_ARM9E
 cpu	CPU_FA526
 cpu 	CPU_XSCALE_81342
 cpu 	CPU_XSCALE_IXP425
 cpu 	CPU_XSCALE_IXP435
 cpu	CPU_XSCALE_PXA2X0
 
 files	"../at91/files.at91"
 files	"../cavium/cns11xx/files.econa"
 files	"../mv/files.mv"
 files	"../mv/discovery/files.db78xxx"
 files	"../mv/kirkwood/files.kirkwood"
 files	"../mv/orion/files.db88f5xxx"
 files	"../mv/orion/files.ts7800"
 files	"../xscale/i8134x/files.crb"
 files	"../xscale/i8134x/files.i81342"
 files	"../xscale/ixp425/files.avila"
 files	"../xscale/ixp425/files.ixp425"
 files	"../xscale/pxa/files.pxa"
 
 options 	PHYSADDR=0x00000000
 
 makeoptions	LDFLAGS="-zmuldefs"
 makeoptions	KERNPHYSADDR=0x00000000
 
 options 	FDT
 
 options 	SOC_MV_DISCOVERY
 options 	SOC_MV_KIRKWOOD
 options 	SOC_MV_ORION
 
 device		at91_board_bwct
 device		at91_board_ethernut5
 device		at91_board_hl200
 device		at91_board_hl201
 device		at91_board_kb920x
 device		at91_board_qila9g20
 device		at91_board_sam9260ek
 device		at91_board_sam9g20ek
 device		at91_board_sam9x25ek
 device		at91_board_tsc4370
 device		at91rm9200
 device		nand
 
 # IIC
 device		twsi
 
 nooptions	SMP
 nooptions	MAXCPU
 
 nooptions	COMPAT_FREEBSD4
 nooptions	COMPAT_FREEBSD5
 nooptions	COMPAT_FREEBSD6
 nooptions	COMPAT_FREEBSD7
 nooptions	COMPAT_FREEBSD9
 nooption	PPC_PROBE_CHIPSET
 
 nodevice	fdc
 nodevice	sym
 nodevice	ukbd
 
 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
 
 #
 # Enable the kernel DTrace hooks which are required to load the DTrace
 # kernel modules.
 #
 options 	KDTRACE_HOOKS
 
 # DTrace core
 # NOTE: introduces CDDL-licensed components into the kernel
 #device		dtrace
 
 # DTrace modules
 #device		dtrace_profile
 #device		dtrace_sdt
 #device		dtrace_fbt
 #device		dtrace_systrace
 #device		dtrace_prototype
 #device		dtnfscl
 #device		dtmalloc
 
 # Alternatively include all the DTrace modules
 #device		dtraceall
Index: stable/11
===================================================================
--- stable/11	(revision 345664)
+++ stable/11	(revision 345665)

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