diff options
| author | James Morris <jmorris@namei.org> | 2009-05-22 04:40:59 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-22 04:40:59 -0400 |
| commit | 2c9e703c618106f5383226fbb1f526cb11034f8a (patch) | |
| tree | 87d7548001ea82f655fede0640466fc16aabcdf7 /arch/arm/mach-pxa/viper.c | |
| parent | 6470c077cae12227318f40f3e6d756caadcce4b0 (diff) | |
| parent | 5805977e63a36ad56594a623f3bd2bebcb7db233 (diff) | |
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/arm/mach-pxa/viper.c')
| -rw-r--r-- | arch/arm/mach-pxa/viper.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index 0e65344e9f53..dd031cc41847 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <mach/audio.h> | 46 | #include <mach/audio.h> |
| 47 | #include <mach/pxafb.h> | 47 | #include <mach/pxafb.h> |
| 48 | #include <mach/i2c.h> | 48 | #include <mach/i2c.h> |
| 49 | #include <mach/regs-uart.h> | ||
| 49 | #include <mach/viper.h> | 50 | #include <mach/viper.h> |
| 50 | 51 | ||
| 51 | #include <asm/setup.h> | 52 | #include <asm/setup.h> |