[Midnightbsd-cvs] src: sys/conf: merge remaining changes for msk.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jun 30 20:38:45 EDT 2008


Log Message:
-----------
merge remaining changes for msk.

Tags:
----
RELENG_0_2

Modified Files:
--------------
    src/sys/conf:
        files (r1.10 -> r1.10.2.1)
    src/sys/dev/pci:
        pcivar.h (r1.1.1.2 -> r1.1.1.2.4.1)

-------------- next part --------------
Index: files
===================================================================
RCS file: /home/cvs/src/sys/conf/files,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -L sys/conf/files -L sys/conf/files -u -r1.10 -r1.10.2.1
--- sys/conf/files
+++ sys/conf/files
@@ -696,6 +696,7 @@
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
 dev/mpt/mpt_raid.c		optional mpt
+dev/msk/if_msk.c		optional msk
 dev/my/if_my.c			optional my
 dev/ncv/ncr53c500.c		optional ncv
 dev/ncv/ncr53c500_pccard.c	optional ncv pccard
Index: pcivar.h
===================================================================
RCS file: /home/cvs/src/sys/dev/pci/pcivar.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.4.1
diff -L sys/dev/pci/pcivar.h -L sys/dev/pci/pcivar.h -u -r1.1.1.2 -r1.1.1.2.4.1
--- sys/dev/pci/pcivar.h
+++ sys/dev/pci/pcivar.h
@@ -343,6 +343,15 @@
     return PCI_GET_POWERSTATE(device_get_parent(dev), dev);
 }
 
+#if 0
+/* depends on ACPI import */
+static __inline int
+pci_find_extcap(device_t dev, int capability, int *capreg)
+{
+    return PCI_FIND_EXTCAP(device_get_parent(dev), dev, capability, capreg);
+}
+#endif
+
 device_t pci_find_bsf(uint8_t, uint8_t, uint8_t);
 device_t pci_find_device(uint16_t, uint16_t);
 #endif	/* _SYS_BUS_H_ */


More information about the Midnightbsd-cvs mailing list