[package] kernel/modules: Add zlib package

[openwrt.git] / package / kernel / modules / block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index a7fbe52..8037449 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -44,7 +44,12 @@ define KernelPackage/ata-ahci
   TITLE:=AHCI Serial ATA support
   KCONFIG:=CONFIG_SATA_AHCI
   FILES:=$(LINUX_DIR)/drivers/ata/ahci.ko
-  AUTOLOAD:=$(call AutoLoad,41,ahci,1)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1)
+    FILES += $(LINUX_DIR)/drivers/ata/libahci.ko
+    AUTOLOAD:=$(call AutoLoad,41,libahci ahci,1)
+  else
+    AUTOLOAD:=$(call AutoLoad,41,ahci,1)
+  endif
   $(call AddDepends/ata)
 endef
 
@@ -594,6 +599,7 @@ $(eval $(call KernelPackage,scsi-core))
 define KernelPackage/scsi-generic
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Kernel support for SCSI generic
+  DEPENDS:=+!TARGET_x86:kmod-scsi-core
   KCONFIG:= \
        CONFIG_CHR_DEV_SG
   FILES:= \
@@ -602,3 +608,20 @@ define KernelPackage/scsi-generic
 endef
 
 $(eval $(call KernelPackage,scsi-generic))
+
+
+define KernelPackage/scsi-cdrom
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Kernel support for CD / DVD drives
+  DEPENDS:=+!TARGET_x86:kmod-scsi-core
+  KCONFIG:= \
+    CONFIG_BLK_DEV_SR \
+    CONFIG_BLK_DEV_SR_VENDOR=n
+  FILES:= \
+    $(LINUX_DIR)/drivers/cdrom/cdrom.ko \
+    $(LINUX_DIR)/drivers/scsi/sr_mod.ko
+  AUTOLOAD:=$(call AutoLoad,30,cdrom) $(call AutoLoad,45,sr_mod)
+endef
+
+$(eval $(call KernelPackage,scsi-cdrom))
+