svn commit: r236379 - in head/sys/dev: hptiop hptmv isp

[Eitan Adler]

Author: eadler
Date: Fri Jun  1 04:34:49 2012
New Revision: 236379
URL: http://svn.freebsd.org/changeset/base/236379

Log:
  Adding missing dependancies for loading hptiop(4), hptmv(4) and isp(4) as modules.
  
  PR:		kern/166239
  Submitted by:	Pavel Timofeev <timp87 at gmail.com>
  Discussed on:	-stable, -scsi
  Reviewed by:	scottl
  No objection from: mjacob
  Approved by:	cperciva
  MFC after:	3 days

Modified:
  head/sys/dev/hptiop/hptiop.c
  head/sys/dev/hptmv/entry.c
  head/sys/dev/isp/isp_pci.c
  head/sys/dev/isp/isp_sbus.c

Modified: head/sys/dev/hptiop/hptiop.c
==============================================================================
--- head/sys/dev/hptiop/hptiop.c	Fri Jun  1 04:26:50 2012	(r236378)
+++ head/sys/dev/hptiop/hptiop.c	Fri Jun  1 04:34:49 2012	(r236379)
@@ -1268,6 +1268,7 @@ static driver_t hptiop_pci_driver = {
 };
 
 DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, 0, 0);
+MODULE_DEPEND(hptiop, cam, 1, 1, 1);
 
 static int hptiop_probe(device_t dev)
 {

Modified: head/sys/dev/hptmv/entry.c
==============================================================================
--- head/sys/dev/hptmv/entry.c	Fri Jun  1 04:26:50 2012	(r236378)
+++ head/sys/dev/hptmv/entry.c	Fri Jun  1 04:34:49 2012	(r236379)
@@ -108,6 +108,7 @@ static devclass_t	hpt_devclass;
 
 #define __DRIVER_MODULE(p1, p2, p3, p4, p5, p6) DRIVER_MODULE(p1, p2, p3, p4, p5, p6)
 __DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
+MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
 
 #define ccb_ccb_ptr spriv_ptr0
 #define ccb_adapter ccb_h.spriv_ptr1

Modified: head/sys/dev/isp/isp_pci.c
==============================================================================
--- head/sys/dev/isp/isp_pci.c	Fri Jun  1 04:26:50 2012	(r236378)
+++ head/sys/dev/isp/isp_pci.c	Fri Jun  1 04:34:49 2012	(r236379)
@@ -372,6 +372,8 @@ static driver_t isp_pci_driver = {
 };
 static devclass_t isp_devclass;
 DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0);
+MODULE_DEPEND(isp, cam, 1, 1, 1);
+MODULE_DEPEND(isp, firmware, 1, 1, 1);
 
 static int
 isp_pci_probe(device_t dev)

Modified: head/sys/dev/isp/isp_sbus.c
==============================================================================
--- head/sys/dev/isp/isp_sbus.c	Fri Jun  1 04:26:50 2012	(r236378)
+++ head/sys/dev/isp/isp_sbus.c	Fri Jun  1 04:34:49 2012	(r236379)
@@ -106,6 +106,8 @@ static driver_t isp_sbus_driver = {
 };
 static devclass_t isp_devclass;
 DRIVER_MODULE(isp, sbus, isp_sbus_driver, isp_devclass, 0, 0);
+MODULE_DEPEND(isp, cam, 1, 1, 1);
+MODULE_DEPEND(isp, firmware, 1, 1, 1);
 
 static int
 isp_sbus_probe(device_t dev)