diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-24 12:50:29 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-24 12:50:29 +0100 |
commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/video/aty/aty128fb.c | |
parent | Doc: Refer to ip-sysctl.txt for strict vs. loose rp_filter mode (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-e70049b9e74267dd47e1ffa62302073487afcb48.tar.xz linux-e70049b9e74267dd47e1ffa62302073487afcb48.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/video/aty/aty128fb.c')
-rw-r--r-- | drivers/video/aty/aty128fb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index e6e299feb51b..2181ce4d7ebd 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c @@ -2365,7 +2365,6 @@ static void fbcon_aty128_bmove(struct display *p, int sy, int sx, int dy, int dx static void aty128_set_suspend(struct aty128fb_par *par, int suspend) { u32 pmgt; - u16 pwr_command; struct pci_dev *pdev = par->pdev; if (!par->pm_reg) |