diff options
| author | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:23:01 -0600 |
|---|---|---|
| committer | Quinn Jensen <quinn.jensen@freescale.com> | 2007-10-24 21:23:01 -0600 |
| commit | fd2d5410a7600d1d9cd7b6619b7904642ac40e6e (patch) | |
| tree | 337217d6448a72a7b2b020ad68cea4fd70d4f13b /arch | |
| parent | b16404cf783185d90be1ae98e7a5be7d1fb38568 (diff) | |
Bugzilla 510: Update to code review fixes following L2618.2
Patch for Bugzilla 510: Update to code review fixes following L2618.2
Changes made to fix bugs and/or port to 2.6.19.2 after including GSO
L2618-2 patches as discovered and discussed in the code review.
http://www.bitshrine.org/gpp/linux-2.6.22-mx-Bugzilla-510-Update-to-code-review-fixes-f.patch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx3/mxc_pm.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/sdma/sdma.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mxc_pm.c b/arch/arm/mach-mx3/mxc_pm.c index bed502168261..bf681b04e0e8 100644 --- a/arch/arm/mach-mx3/mxc_pm.c +++ b/arch/arm/mach-mx3/mxc_pm.c @@ -304,7 +304,6 @@ void mxc_pm_lowpower(int mode) __raw_writel(INT_GPIO1, AVIC_INTDISNUM); /* work-around for SR mode after camera related test */ - mxc_clks_enable(CSI_BAUD); __raw_writel(0x51, IPU_CONF); break; @@ -337,7 +336,6 @@ void mxc_pm_lowpower(int mode) /* work-around for SR mode after camera related test */ __raw_writel(ipu_conf, IPU_CONF); - mxc_clks_disable(CSI_BAUD); __raw_writel(INT_GPT, AVIC_INTENNUM); __raw_writel(INT_GPIO1, AVIC_INTENNUM); diff --git a/arch/arm/plat-mxc/sdma/sdma.c b/arch/arm/plat-mxc/sdma/sdma.c index a104eb5a56d2..6ad494b25cda 100644 --- a/arch/arm/plat-mxc/sdma/sdma.c +++ b/arch/arm/plat-mxc/sdma/sdma.c @@ -366,7 +366,6 @@ static unsigned short sdma_get_pc(sdma_periphT peripheral_type, } return res; - } /*! |