]> err.no Git - linux-2.6/commit
Fix broken fix for fsl-diu-db
authorTakashi Iwai <tiwai@suse.de>
Tue, 8 Jul 2008 16:41:17 +0000 (18:41 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Jul 2008 19:51:08 +0000 (12:51 -0700)
commit48948a3e237ff47823d414704aeb8604a4c61ad0
treecf90fa2aa7967ca93c7248d5d3bcf93b4e957eb9
parentf57e91682d141ea50d8c6d42cdc251b6256a3755
Fix broken fix for fsl-diu-db

On 2.6.26-rc9, the commit 05946bce839b4fed5442dbfab77060fb75e051f3
("fsl_diu_fb: fix build with CONFIG_PM=y, plus fix some warnings")
breaks its previous fix f969c5672b16b857e5231ad3c78f08d8ef3305aa
("fsl-diu-db: compile fix")

This patch reverts the broken part.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/fsl-diu-fb.c