diff options
| author | Chris Ball <cjb@laptop.org> | 2013-03-19 13:07:13 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-03-19 13:07:13 -0400 |
| commit | 2c06aeb25ca92b839399c4e2c956cffc95b41978 (patch) | |
| tree | 3fb5007eac3adb9d4c973978c3b084fa077e926b /scripts/link-vmlinux.sh | |
| parent | 9665f7f234d095fc7c28c70df819a3f7b6a7b4e8 (diff) | |
| parent | 908ab9368866e6edf0edebdd546adefd5f3128f9 (diff) | |
Merge tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into mmc-next
ARM: tegra: DT-related fixes needed by the MMC tree
In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.
Diffstat (limited to 'scripts/link-vmlinux.sh')
| -rw-r--r-- | scripts/link-vmlinux.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index b3d907eb93a9..3d569d6022c2 100644 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -132,7 +132,14 @@ if [ "$1" = "clean" ]; then fi # We need access to CONFIG_ symbols -. ./.config +case "${KCONFIG_CONFIG}" in +*/*) + . "${KCONFIG_CONFIG}" + ;; +*) + # Force using a file from the current directory + . "./${KCONFIG_CONFIG}" +esac #link vmlinux.o info LD vmlinux.o |