diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-08 03:13:43 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-08 03:13:43 +0100 |
| commit | 62cd2fa82a38cb3d653517822c62a39cdbb5f365 (patch) | |
| tree | b5d2f198c14455822c8b03abde2c8d8080cda24a /samples | |
| parent | Merge branch 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/l... (diff) | |
| parent | fbcon: don't lose the console font across generic->chip driver switch (diff) | |
| download | linux-62cd2fa82a38cb3d653517822c62a39cdbb5f365.tar.xz linux-62cd2fa82a38cb3d653517822c62a39cdbb5f365.zip | |
Merge branch 'console-fixes' into drm-next
(not the fbcon maintainer pull 2)
fix bug in vgacon on bootup and fbcon losing fonts on startup.
* console-fixes: (50 commits)
fbcon: don't lose the console font across generic->chip driver switch
vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/seccomp/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile index bbbd276659ba..7203e66dcd6f 100644 --- a/samples/seccomp/Makefile +++ b/samples/seccomp/Makefile @@ -19,6 +19,7 @@ bpf-direct-objs := bpf-direct.o # Try to match the kernel target. ifndef CONFIG_64BIT +ifndef CROSS_COMPILE # s390 has -m31 flag to build 31 bit binaries ifndef CONFIG_S390 @@ -35,6 +36,7 @@ HOSTLOADLIBES_bpf-direct += $(MFLAG) HOSTLOADLIBES_bpf-fancy += $(MFLAG) HOSTLOADLIBES_dropper += $(MFLAG) endif +endif # Tell kbuild to always build the programs always := $(hostprogs-y) |