diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /mk/modules.mk | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'mk/modules.mk')
| -rw-r--r-- | mk/modules.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 67118a951..c0791abfa 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1749,10 +1749,6 @@ $(eval $(call KMOD_template,CRC32,crc32, \ $(MODULES_DIR)/kernel/lib/crc32 \ ,01)) -#$(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \ -# $(MODULES_DIR)/kernel/lib/libcrc32c \ -#,10)) - # # parallel port support # @@ -1788,6 +1784,7 @@ $(eval $(call KMOD_template,OPROFILE,oprofile,\ # # SPI # + $(eval $(call KMOD_template,SPI_BITBANG,spi-bitbang,\ $(MODULES_DIR)/kernel/drivers/spi/spi-bitbang \ ,20)) @@ -1799,6 +1796,7 @@ $(eval $(call KMOD_template,SPI_IMX,spi-imx,\ # # I2C # + $(eval $(call KMOD_template,I2C_DEV,i2c-dev,\ $(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \ ,20)) @@ -1814,6 +1812,7 @@ $(eval $(call KMOD_template,SCX200_ACB,scx200-acb,\ # # VirtIO # + $(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\ $(MODULES_DIR)/kernel/drivers/net/virtio_blk \ ,20)) |