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 /target/linux/config/Config.in.multimedia | |
| parent | 52ee190f6bbbf0bf0c3d354f0370c409aed14506 (diff) | |
| parent | da28ccc6f848695609d32090142f1b4af0e27b17 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/alix2d/kernel.config
Diffstat (limited to 'target/linux/config/Config.in.multimedia')
| -rw-r--r-- | target/linux/config/Config.in.multimedia | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 87dc93aa0..a67af9a89 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -135,5 +135,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC default n help -#source package/em28xx/Config.in endmenu |