diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-17 15:29:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-17 15:29:05 +0200 |
| commit | b2e4bbd4e62982852b8a7da8f618d01d2013641e (patch) | |
| tree | 968e7998c78e750162e60c747ab039f78d2f8289 /target/linux/Config.in | |
| parent | 1a2a22729ff0256725a3561e46f465efc18801f7 (diff) | |
| parent | d6aaf0be5bfa8e5944d9ae44cf175f9388564ac6 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/binutils/Makefile
Diffstat (limited to 'target/linux/Config.in')
| -rw-r--r-- | target/linux/Config.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in index 263b17a45..d840e9014 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -6,7 +6,6 @@ source target/linux/config/Config.in.input source target/linux/config/Config.in.pcmcia source target/linux/config/Config.in.network source target/linux/config/Config.in.netfilter -source target/linux/config/Config.in.ipvs source target/linux/config/Config.in.multimedia source target/linux/config/Config.in.crypto source target/linux/config/Config.in.bluetooth |