diff options
| author | Dorian Snyder <dastin1015@gmail.com> | 2013-06-12 02:24:45 -0700 |
|---|---|---|
| committer | Dorian Snyder <dastin1015@gmail.com> | 2013-06-20 00:06:04 -0700 |
| commit | 4b2308ce699b9c599dd6e6acf57ac11f483381d9 (patch) | |
| tree | 4c31179b06d094887b1c8ca70264cf8f184a5981 /kernel | |
| parent | 855d6a6c1f7c54ef073caac3f6c5f9b1ed72eb4d (diff) | |
| download | kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.gz kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.bz2 kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.zip | |
d710: initial support for the Epic 4G Touch (SPH-D710)
Change-Id: Iafbd9fb45253b02d539ac0ba114f57b3bf9eeed4
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Makefile | 3 | ||||
| -rw-r--r-- | kernel/kernel_sec_debug.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 2d64cfcc8b4..9f665662afe 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -107,6 +107,9 @@ obj-$(CONFIG_PERF_EVENTS) += events/ obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o obj-$(CONFIG_PADATA) += padata.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o +ifeq ($(CONFIG_MACH_U1_NA_SPR),y) +obj-$(CONFIG_SEC_DEBUG) += kernel_sec_debug.o +endif ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is diff --git a/kernel/kernel_sec_debug.c b/kernel/kernel_sec_debug.c index 6ff0793bdcc..4fc452746aa 100644 --- a/kernel/kernel_sec_debug.c +++ b/kernel/kernel_sec_debug.c @@ -160,7 +160,7 @@ void kernel_sec_set_cp_upload(void) } mdelay(10); if (++wait_count > 500) { - printk(KERN_EMERG"- Fail to set CP uploadmode." / + printk(KERN_EMERG"- Fail to set CP uploadmode." \ "cp_irq_mask: 0x%04X\n", cp_irq_mask); break; } @@ -566,7 +566,7 @@ bool kernel_set_debug_level(int level) } else {*/ - printk(KERN_NOTICE "(kernel_set_debug_level)" / + printk(KERN_NOTICE "(kernel_set_debug_level)" \ " sec_set_param_value is not intialized !!\n"); return 0; /*}*/ |