aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-09 15:24:19 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-09 15:24:19 -0800
commit45ff993d2b0b4c07038457cdf07ecf648abd3d78 (patch)
treeae2f89ce5741e36d6eaab3178d86c2cd754801e4 /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)
parent[ARM] pxa: fix one-shot timer mode (diff)
downloadlinux-dev-45ff993d2b0b4c07038457cdf07ecf648abd3d78.tar.xz
linux-dev-45ff993d2b0b4c07038457cdf07ecf648abd3d78.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa: fix one-shot timer mode [ARM] 4645/1: Cyberpro: Trivial fix to restore 16bpp mode. [ARM] 4644/2: fix flush_kern_tlb_range() in module space [ARM] Allow watchdog drivers to be selected again [ARM] 4633/1: omap build fix when FB enabled [ARM] 4642/2: netX: default config for netx based boards [ARM] 4641/2: netX: fix kobject_name type [ARM] Fix iop3xx macro
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/cyber2000fb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 5fb8675e0d6b..d0e4cb618269 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -874,6 +874,8 @@ static int cyber2000fb_set_par(struct fb_info *info)
default:
BUG();
}
+ break;
+
case 24:/* TRUECOLOUR, 16m */
hw.co_pixfmt = CO_PIXFMT_24BPP;
hw.width *= 3;