diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 11:16:17 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 11:16:17 +0100 |
| commit | 652c86bc8576ea994df2bd18f6b6ca4143be9ed3 (patch) | |
| tree | f9cd782af6743c7ac93e95ba0acac5bd7aa5d3f2 /mk/modules.mk | |
| parent | 3ac6403bb723a4b4f5c3ca155df61e77c4d59d6c (diff) | |
| parent | 8f148a08f29ccb6c21f108549e20aa8e0bb04b79 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
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 32c9fe05c..428fe2700 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1218,7 +1218,6 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\ $(eval $(call KMOD_template,SND_BCM2708_SOC_I2S,snd-bcm2709-soc-i2s,\ $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-pcm5102a \ - $(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8804 \ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-bcm2708-i2s \ ,55, kmod-snd-soc)) @@ -1226,7 +1225,7 @@ $(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifibe $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-dac \ ,56, kmod-snd-bcm2709-soc-i2s)) -$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DAC,snd-bcm2709-soc-hifiberry-dac,\ +$(eval $(call KMOD_template,SND_BCM2708_SOC_HIFIBERRY_DIGI,snd-bcm2709-soc-hifiberry-digi,\ $(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-hifiberry-digi \ ,56, kmod-snd-bcm2709-soc-i2s)) @@ -1418,8 +1417,8 @@ $(eval $(call KMOD_template,BT_RFCOMM,bt-rfcomm,\ # Misc devices # -$(eval $(call KMOD_template,SOFTDOG,softdog,\ - $(MODULES_DIR)/kernel/drivers/char/watchdog/softdog \ +$(eval $(call KMOD_template,SOFT_WATCHDOG,soft-watchdog,\ + $(MODULES_DIR)/kernel/drivers/watchdog/softdog \ ,95)) $(eval $(call KMOD_template,FW_LOADER,fw-loader,\ |