diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 12:16:44 -0400 |
| commit | f53f292eeaa234615c31a1306babe703fc4263f2 (patch) | |
| tree | 707b0933a20f7dc05495e974243a23b5c9f8c918 /arch/arm/plat-samsung/include/plat/s3c2416.h | |
| parent | 15b9c359f288b09003cb70f7ed204affc0c6614d (diff) | |
| parent | a9499fa7cd3fd4824a7202d00c766b269fa3bda6 (diff) | |
Merge remote-tracking branch 'efi/chainsaw' into x86/efi
Resolved Conflicts:
drivers/firmware/efivars.c
fs/efivarsfs/file.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/s3c2416.h')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/s3c2416.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/s3c2416.h b/arch/arm/plat-samsung/include/plat/s3c2416.h index 7178e338e25e..f27399a3c68d 100644 --- a/arch/arm/plat-samsung/include/plat/s3c2416.h +++ b/arch/arm/plat-samsung/include/plat/s3c2416.h | |||
| @@ -25,6 +25,7 @@ extern int s3c2416_baseclk_add(void); | |||
| 25 | 25 | ||
| 26 | extern void s3c2416_restart(char mode, const char *cmd); | 26 | extern void s3c2416_restart(char mode, const char *cmd); |
| 27 | 27 | ||
| 28 | extern void s3c2416_init_irq(void); | ||
| 28 | extern struct syscore_ops s3c2416_irq_syscore_ops; | 29 | extern struct syscore_ops s3c2416_irq_syscore_ops; |
| 29 | 30 | ||
| 30 | #else | 31 | #else |