diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /include/video | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/sbusfb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/video/sbusfb.h b/include/video/sbusfb.h index eed14d1fa..accf1820a 100644 --- a/include/video/sbusfb.h +++ b/include/video/sbusfb.h @@ -90,7 +90,8 @@ struct fb_info_sbusfb { struct display disp; struct display_switch dispsw; struct fbtype type; - struct linux_sbus_device *sbdp; + struct sbus_dev *sbdp; + spinlock_t lock; int prom_node, prom_parent; union { struct fb_info_creator ffb; |