diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-06-14 15:20:18 +0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-06-14 15:44:49 +0400 |
| commit | d987dd137bac8dca9b0015763d3106f48bb8a596 (patch) | |
| tree | ef887505b3c904c548d58ec9bb6f4970a0877042 /scripts/Makefile | |
| parent | c85251f8562095cd6fd63ae786354283c5318303 (diff) | |
| parent | 211c17aaee644bb808fbdeef547ac99db92c01ed (diff) | |
| download | linux-d987dd137bac8dca9b0015763d3106f48bb8a596.tar.xz | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/cfg80211.c
Diffstat (limited to 'scripts/Makefile')
| -rw-r--r-- | scripts/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index df7678febf27..a55b0067758a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -8,11 +8,16 @@ # conmakehash: Create arrays for initializing the kernel console tables # docproc: Used in Documentation/DocBook +HOST_EXTRACFLAGS += -I$(srctree)/tools/include + hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_LOGO) += pnmtologo hostprogs-$(CONFIG_VT) += conmakehash hostprogs-$(CONFIG_IKCONFIG) += bin2c hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount +hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable + +HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include always := $(hostprogs-y) $(hostprogs-m) |