diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-07-08 18:41:17 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-08 21:51:08 +0200 |
commit | 48948a3e237ff47823d414704aeb8604a4c61ad0 (patch) | |
tree | cf90fa2aa7967ca93c7248d5d3bcf93b4e957eb9 /kernel | |
parent | Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
download | linux-48948a3e237ff47823d414704aeb8604a4c61ad0.tar.xz linux-48948a3e237ff47823d414704aeb8604a4c61ad0.zip |
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>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions