diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 02:32:42 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 02:32:42 +0100 |
| commit | 9f8050c4f99789d03ca96d4e625bd6637241828f (patch) | |
| tree | 1da2ab64926a1661ab97407ea5ca5e01cc2e977a /arch/arm/mach-s3c2440/s3c244x.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... (diff) | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/... (diff) | |
| download | linux-9f8050c4f99789d03ca96d4e625bd6637241828f.tar.xz linux-9f8050c4f99789d03ca96d4e625bd6637241828f.zip | |
Merge tag 'fixes-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull last minute fixes from Olof Johansson:
"One samsung build fix due to a mis-applied patch, and a small set of
OMAP fixes. This should be the last from arm-soc for 3.3, hopefully."
* tag 'fixes-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: S3C2440: Fixed build error for s3c244x
ARM: OMAP2+: Fix module build errors with CONFIG_OMAP4_ERRATA_I688
ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision
ARM: OMAP2+: Remove apply_uV constraints for fixed regulator
ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c244x.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c244x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c index 744930a870eb..d15852f642b7 100644 --- a/arch/arm/mach-s3c2440/s3c244x.c +++ b/arch/arm/mach-s3c2440/s3c244x.c @@ -207,3 +207,4 @@ void s3c244x_restart(char mode, const char *cmd) /* we'll take a jump through zero as a poor second */ soft_restart(0); +} |