aboutsummaryrefslogtreecommitdiff
path: root/Config.in
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-06-22 23:43:08 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-06-22 23:43:08 +0200
commitf3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a (patch)
tree2b1e7628b5bad58c4b4065b9de30321bd02ff502 /Config.in
parentb10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d (diff)
parent7b7b4260966a5d991b1dabc82c792fbecd77c63a (diff)
downloadbuildroot-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.tar.gz
buildroot-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.tar.bz2
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Conflicts: target/Makefile.in
Diffstat (limited to 'Config.in')
-rw-r--r--Config.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Config.in b/Config.in
index 2554c58656..fe423ced01 100644
--- a/Config.in
+++ b/Config.in
@@ -288,4 +288,4 @@ source "fs/Config.in"
source "boot/Config.in"
-source "target/Config.in"
+source "linux/Config.in"