diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 02:18:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-07 02:18:44 +0200 |
| commit | ee792cd4fe5062c8c488e1b43ab877bba6e073d2 (patch) | |
| tree | c14446ed347bec18fac580f293e77af0c45eb80c /mk | |
| parent | 52ee190f6bbbf0bf0c3d354f0370c409aed14506 (diff) | |
| parent | da28ccc6f848695609d32090142f1b4af0e27b17 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/alix2d/kernel.config
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 7dd4b232a..1a8b5c1cd 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1062,7 +1062,6 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\ $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \ - $(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \ $(MODULES_DIR)/kernel/drivers/media/video/videodev \ ,65)) |