diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /drivers/rtc/alarm.c | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'drivers/rtc/alarm.c')
| -rw-r--r-- | drivers/rtc/alarm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/alarm.c b/drivers/rtc/alarm.c index 28b0df836a30..12e6f3c8acfb 100644 --- a/drivers/rtc/alarm.c +++ b/drivers/rtc/alarm.c @@ -33,6 +33,7 @@ #define ANDROID_ALARM_PRINT_FLOW (1U << 6) static int debug_mask = ANDROID_ALARM_PRINT_ERROR | \ + ANDROID_ALARM_PRINT_SUSPEND | \ ANDROID_ALARM_PRINT_INIT_STATUS; module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP); |