svn commit: r188091 - in projects/vap7/sys: . conf contrib/pf dev dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar5416 ...

[Sam Leffler]

Author: sam
Date: Tue Feb  3 19:27:06 2009
New Revision: 188091
URL: http://svn.freebsd.org/changeset/base/188091

Log:
  merge r184251: add cfi driver

Added:
  projects/vap7/sys/dev/cfi/
     - copied from r184251, head/sys/dev/cfi/
Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/conf/files
  projects/vap7/sys/conf/files.powerpc
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)

Modified: projects/vap7/sys/conf/files
==============================================================================
--- projects/vap7/sys/conf/files	Tue Feb  3 19:25:23 2009	(r188090)
+++ projects/vap7/sys/conf/files	Tue Feb  3 19:27:06 2009	(r188091)
@@ -666,6 +666,8 @@ dev/buslogic/bt_pci.c		optional bt pci
 dev/cardbus/cardbus.c		optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/cardbus/cardbus_device.c	optional cardbus
+dev/cfi/cfi_core.c		optional cfi
+dev/cfi/cfi_dev.c		optional cfi
 dev/ciss/ciss.c			optional ciss
 dev/cm/smc90cx6.c		optional cm
 dev/cmx/cmx.c			optional cmx

Modified: projects/vap7/sys/conf/files.powerpc
==============================================================================
--- projects/vap7/sys/conf/files.powerpc	Tue Feb  3 19:25:23 2009	(r188090)
+++ projects/vap7/sys/conf/files.powerpc	Tue Feb  3 19:27:06 2009	(r188091)
@@ -16,6 +16,7 @@ font.h                          optional
 #
 
 dev/bm/if_bm.c			optional	bm powermac
+dev/cfi/cfi_bus_lbc.c		optional	cfi
 dev/fb/fb.c			optional	sc
 dev/hwpmc/hwpmc_powerpc.c	optional	hwpmc
 dev/kbd/kbd.c			optional	sc