tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge

Browse Source
This commit is contained in:
Paul Mackerras
2009-04-22 13:02:09 +10:00
parent 0658c16056 6d25b688ec
commit 5bd3ef84d7
1794 changed files with 127770 additions and 67927 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/powerpc/sysdev/fsl_lbc.c
+1 -1
View File
@@ -150,7 +150,7 @@ int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, u32 mar)
spin_lock_irqsave(&fsl_lbc_lock, flags);
out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width));
out_be32(&fsl_lbc_regs->mar, mar);
switch (upm->width) {
case 8: