diff options
| author | James Morris <jmorris@namei.org> | 2009-05-22 12:40:59 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-22 12:40:59 +0400 |
| commit | 2c9e703c618106f5383226fbb1f526cb11034f8a (patch) | |
| tree | 87d7548001ea82f655fede0640466fc16aabcdf7 /arch/xtensa/variants/s6000/Makefile | |
| parent | 6470c077cae12227318f40f3e6d756caadcce4b0 (diff) | |
| parent | 5805977e63a36ad56594a623f3bd2bebcb7db233 (diff) | |
| download | linux-2c9e703c618106f5383226fbb1f526cb11034f8a.tar.xz | |
Merge branch 'master' into next
Conflicts:
fs/exec.c
Removed IMA changes (the IMA checks are now performed via may_open()).
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/xtensa/variants/s6000/Makefile')
| -rw-r--r-- | arch/xtensa/variants/s6000/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/variants/s6000/Makefile b/arch/xtensa/variants/s6000/Makefile index 03b3975468bd..d83f3805130c 100644 --- a/arch/xtensa/variants/s6000/Makefile +++ b/arch/xtensa/variants/s6000/Makefile @@ -1,3 +1,4 @@ # s6000 Makefile obj-y += irq.o gpio.o +obj-$(CONFIG_XTENSA_CALIBRATE_CCOUNT) += delay.o |