diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 09:55:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 09:55:48 -0700 |
| commit | 854a989546c12683186c84601d4902591dddd8a9 (patch) | |
| tree | 143362c88a48958bdf68396379c4401f6caa82ae /drivers/video/sunxvr2500.c | |
| parent | 633331f389c2d9c631371d09a54626a5e4749452 (diff) | |
| parent | 28e6103665301ce60634e8a77f0b657c6cc099de (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Fix debugger syscall restart interactions.
sparc: Fix ptrace() detach.
sparc32: Don't twiddle PT_DTRACE in exec.
sparc video: remove open boot prom code
Diffstat (limited to 'drivers/video/sunxvr2500.c')
| -rw-r--r-- | drivers/video/sunxvr2500.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c index c3869a96ab5..b1dde09e701 100644 --- a/drivers/video/sunxvr2500.c +++ b/drivers/video/sunxvr2500.c @@ -9,10 +9,9 @@ #include <linux/fb.h> #include <linux/pci.h> #include <linux/init.h> +#include <linux/of_device.h> #include <asm/io.h> -#include <asm/prom.h> -#include <asm/of_device.h> struct s3d_info { struct fb_info *info; |