aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/link-vmlinux.sh
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-16 22:24:53 -0400
committerOlof Johansson <olof@lixom.net>2012-09-16 22:24:53 -0400
commitd1226e8f98f130918265fb5b4dddcb60b783eb34 (patch)
tree5272a7828311a9b336d15c005704cf27b083d41c /scripts/link-vmlinux.sh
parentcccc277ba840f32d252a785ab1df686fdc0f49f5 (diff)
parent47d85ec2a23552fd3d8b56778a23a5a843c5b9b1 (diff)
Merge tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Kevin Hilman <khilman@ti.com>: Updates for omap_device layer for v3.7. Allows omap_device layer to keep track of driver bound status in order to make more intelligent decisions about idling unused devices. * tag 'devel-omap-device-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: omap_device: idle devices with no driver bound ARM: OMAP: omap_device: don't attempt late suspend if no driver bound ARM: OMAP: omap_device: keep track of driver bound status + sync to 3.6-rc5
Diffstat (limited to 'scripts/link-vmlinux.sh')
-rw-r--r--scripts/link-vmlinux.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 4629038c9e5a..4235a6361fec 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -211,7 +211,7 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
211 211
212 if ! cmp -s System.map .tmp_System.map; then 212 if ! cmp -s System.map .tmp_System.map; then
213 echo >&2 Inconsistent kallsyms data 213 echo >&2 Inconsistent kallsyms data
214 echo >&2 echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround 214 echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
215 cleanup 215 cleanup
216 exit 1 216 exit 1
217 fi 217 fi