xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.6-rc4'

Browse Source 
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
This commit is contained in:
Tomi Valkeinen
2012-09-03 09:26:33 +03:00
parent 14d33d3846 4cbe5a555f
commit c50e86ce7c
8486 changed files with 480768 additions and 206632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/video/omap2/dss/core.c
View File

@@ -206,8 +206,7 @@ static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d)
{
DSSDBG("pm notif %lu\n", v);
switch (v)
{
switch (v) {
case PM_SUSPEND_PREPARE:
DSSDBG("suspending displays\n");
return dss_suspend_all_devices();
@@ -221,8 +220,7 @@ static int omap_dss_pm_notif(struct notifier_block *b, unsigned long v, void *d)
}
}
static struct notifier_block omap_dss_pm_notif_block =
{
static struct notifier_block omap_dss_pm_notif_block = {
.notifier_call = omap_dss_pm_notif,
};