svn commit: r189990 - in stable/7/sys: . conf contrib/pf dev/ath/ath_hal dev/cxgb dev/sis modules/sis pci

[Warner Losh]

Author: imp
Date: Wed Mar 18 21:46:55 2009
New Revision: 189990
URL: http://svn.freebsd.org/changeset/base/189990

Log:
  MFC 181524:
   Move sis to sys/dev/sis for consistency.

Added:
  stable/7/sys/dev/sis/
     - copied from r181524, head/sys/dev/sis/
Deleted:
  stable/7/sys/pci/if_sis.c
  stable/7/sys/pci/if_sisreg.h
Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/conf/files
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/modules/sis/Makefile

Modified: stable/7/sys/conf/files
==============================================================================
--- stable/7/sys/conf/files	Wed Mar 18 21:43:16 2009	(r189989)
+++ stable/7/sys/conf/files	Wed Mar 18 21:46:55 2009	(r189990)
@@ -1107,6 +1107,7 @@ dev/si/si3_t225.c		optional si
 dev/si/si_eisa.c		optional si eisa
 dev/si/si_isa.c			optional si isa
 dev/si/si_pci.c			optional si pci
+dev/sis/if_sis.c		optional sis pci
 dev/sk/if_sk.c			optional sk pci
 dev/smbus/smb.c			optional smb
 dev/smbus/smbconf.c		optional smbus
@@ -2112,7 +2113,6 @@ pci/amdsmb.c			optional amdsmb pci
 pci/if_mn.c			optional mn pci
 pci/if_pcn.c			optional pcn pci
 pci/if_rl.c			optional rl pci
-pci/if_sis.c			optional sis pci
 pci/if_ste.c			optional ste pci
 pci/if_tl.c			optional tl pci
 pci/if_wb.c			optional wb pci

Modified: stable/7/sys/modules/sis/Makefile
==============================================================================
--- stable/7/sys/modules/sis/Makefile	Wed Mar 18 21:43:16 2009	(r189989)
+++ stable/7/sys/modules/sis/Makefile	Wed Mar 18 21:46:55 2009	(r189990)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../pci
+.PATH: ${.CURDIR}/../../dev/sis
 
 KMOD=	if_sis
 SRCS=	if_sis.c device_if.h bus_if.h pci_if.h