Permalink
Browse files

Merge remote-tracking branch 'github/3.7/vhba' into 3.7/master

  • Loading branch information...
2 parents 425cd0a + 3379797 commit f9884d1ec64f15c450da786e65501f2a22cbd6b3 @heftig heftig committed Dec 22, 2012
View
@@ -144,4 +144,6 @@ source "drivers/staging/imx-drm/Kconfig"
source "drivers/staging/dgrp/Kconfig"
+source "drivers/staging/vhba/Kconfig"
+
endif # STAGING
View
@@ -41,6 +41,7 @@ obj-$(CONFIG_FB_SM7XX) += sm7xxfb/
obj-$(CONFIG_CRYSTALHD) += crystalhd/
obj-$(CONFIG_CXT1E1) += cxt1e1/
obj-$(CONFIG_FB_XGI) += xgifb/
+obj-$(CONFIG_VHBA) += vhba/
obj-$(CONFIG_TIDSPBRIDGE) += tidspbridge/
obj-$(CONFIG_ACPI_QUICKSTART) += quickstart/
obj-$(CONFIG_SBE_2T3E3) += sbe-2t3e3/
@@ -0,0 +1,9 @@
+config VHBA
+ tristate "Virtual (SCSI) Host Bus Adapter"
+ depends on SCSI
+ ---help---
+ This is the in-kernel part of CDEmu, a CD/DVD-ROM device
+ emulator.
+
+ This driver can also be built as a module. If so, the module
+ will be called vhba.
@@ -0,0 +1 @@
+obj-$(CONFIG_VHBA) += vhba.o
Oops, something went wrong.

0 comments on commit f9884d1

Please sign in to comment.