diff options
author | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 16:55:23 +0200 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 16:55:23 +0200 |
commit | b757f17e9184b65428c48a281d82f9acb3e96f0e (patch) | |
tree | 7dc22c9f82f78c20caeff00fdd68a2e92e40504a /tools/lib/traceevent/Makefile | |
parent | Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt (diff) | |
parent | ARM: mvebu: Align the internal registers virtual base to support LPAE (diff) | |
download | linux-b757f17e9184b65428c48a281d82f9acb3e96f0e.tar.xz linux-b757f17e9184b65428c48a281d82f9acb3e96f0e.zip |
Merge tag 'tags/soc_for_v3.10' into mvebu/dt
Pulling in mvebu branches which contain changes to armada*.dts? files for LPAE
conversion.
mvebu soc changes for v3.10
- use the mvebu-mbus driver
- prep for LPAE support
Depends:
- mvebu/cleanup (tags/cleanup_for_v3.10)
- mvebu/drivers (tags/drivers_for_v3.10)
Diffstat (limited to 'tools/lib/traceevent/Makefile')
-rw-r--r-- | tools/lib/traceevent/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index a20e32033431..0b0a90787db6 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -122,7 +122,7 @@ export Q VERBOSE EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION) -INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) +INCLUDES = -I. $(CONFIG_INCLUDES) # Set compile option CFLAGS if not set elsewhere CFLAGS ?= -g -Wall |