From owner-p4-projects@FreeBSD.ORG Sun Mar 9 16:59:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77ED51065673; Sun, 9 Mar 2008 16:59:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C65A106566B for ; Sun, 9 Mar 2008 16:59:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 013D08FC18 for ; Sun, 9 Mar 2008 16:59:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29GxICp041663 for ; Sun, 9 Mar 2008 16:59:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29GxIfs041661 for perforce@freebsd.org; Sun, 9 Mar 2008 16:59:18 GMT (envelope-from sam@freebsd.org) Date: Sun, 9 Mar 2008 16:59:18 GMT Message-Id: <200803091659.m29GxIfs041661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 137234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2008 16:59:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=137234 Change 137234 by sam@sam_ebb on 2008/03/09 16:58:33 IFC Affected files ... .. //depot/projects/vap/sys/conf/files#22 edit .. //depot/projects/vap/sys/conf/options#13 edit Differences ... ==== //depot/projects/vap/sys/conf/files#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1270 2008/02/26 03:02:20 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1278 2008/03/06 08:09:44 rink Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -511,6 +511,8 @@ dev/cardbus/cardbus_device.c optional cardbus dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm +dev/cmx/cmx.c optional cmx +dev/cmx/cmx_pccard.c optional cmx pccard dev/cnw/if_cnw.c optional cnw pccard dev/cpufreq/ichss.c optional cpufreq dev/cs/if_cs.c optional cs @@ -625,8 +627,6 @@ compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_82571.c optional em \ compile-with "${NORMAL_C} -I$S/dev/em" -dev/em/e1000_82575.c optional em \ - compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_api.c optional em \ compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_ich8lan.c optional em \ @@ -711,6 +711,20 @@ dev/ieee488/pcii.c optional pcii dev/ieee488/tnt4882.c optional tnt4882 dev/ieee488/upd7210.c optional pcii | tnt4882 +dev/igb/if_igb.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_82575.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_api.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_mac.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_manage.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_nvm.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_phy.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" dev/iicbus/ad7418.c optional ad7418 dev/iicbus/ds1672.c optional ds1672 dev/iicbus/icee.c optional icee @@ -919,6 +933,7 @@ dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci dev/puc/pucdata.c optional puc pci +dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral dev/ral/if_ral_pci.c optional ral pci @@ -939,8 +954,10 @@ dev/sbsh/if_sbsh.c optional sbsh dev/scc/scc_if.m optional scc dev/scc/scc_bfe_ebus.c optional scc ebus +dev/scc/scc_bfe_quicc.c optional scc quicc dev/scc/scc_bfe_sbus.c optional scc fhc | scc sbus dev/scc/scc_core.c optional scc +dev/scc/scc_dev_quicc.c optional scc quicc dev/scc/scc_dev_sab82532.c optional scc dev/scc/scc_dev_z8530.c optional scc dev/scd/scd.c optional scd isa @@ -1103,6 +1120,7 @@ dev/uart/uart_core.c optional uart dev/uart/uart_dbg.c optional uart gdb dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 +dev/uart/uart_dev_quicc.c optional uart quicc dev/uart/uart_dev_sab82532.c optional uart uart_sab82532 dev/uart/uart_dev_sab82532.c optional uart scc dev/uart/uart_dev_z8530.c optional uart uart_z8530 @@ -1162,6 +1180,7 @@ dev/usb/usbdi.c optional usb dev/usb/usbdi_util.c optional usb dev/usb/uscanner.c optional uscanner +dev/usb/uslcom.c optional uslcom dev/usb/uvisor.c optional uvisor dev/usb/uvscom.c optional uvscom dev/utopia/idtphy.c optional utopia @@ -1316,6 +1335,7 @@ geom/part/g_part_bsd.c optional geom_part_bsd geom/part/g_part_gpt.c optional geom_part_gpt geom/part/g_part_mbr.c optional geom_part_mbr +geom/part/g_part_vtoc8.c optional geom_part_vtoc8 geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 geom/shsec/g_shsec.c optional geom_shsec @@ -1433,6 +1453,7 @@ kern/kern_condvar.c standard kern/kern_conf.c standard kern/kern_cpu.c standard +kern/kern_cpuset.c standard kern/kern_context.c standard kern/kern_descrip.c standard kern/kern_environment.c standard @@ -1888,6 +1909,7 @@ netinet/ip_fw2.c optional ipfirewall \ compile-with "${NORMAL_C} -I$S/contrib/pf" netinet/ip_fw_pfil.c optional ipfirewall +netinet/ip_fw_nat.c optional ipfirewall_nat netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet netinet/ip_ipsec.c optional ipsec ==== //depot/projects/vap/sys/conf/options#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.618 2008/02/20 07:50:13 thompsa Exp $ +# $FreeBSD: src/sys/conf/options,v 1.619 2008/03/02 00:52:49 marcel Exp $ # # On the handling of kernel options # @@ -94,6 +94,7 @@ GEOM_PART_BSD opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_MBR opt_geom.h +GEOM_PART_VTOC8 opt_geom.h GEOM_PC98 opt_geom.h GEOM_RAID3 opt_geom.h GEOM_SHSEC opt_geom.h