diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/video/aty/radeon_monitor.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/video/aty/radeon_monitor.c')
| -rw-r--r-- | drivers/video/aty/radeon_monitor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c index b4d4b88afc09..9261c918fde8 100644 --- a/drivers/video/aty/radeon_monitor.c +++ b/drivers/video/aty/radeon_monitor.c | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | #include "radeonfb.h" | 1 | #include "radeonfb.h" |
| 2 | |||
| 3 | #include <linux/slab.h> | ||
| 4 | |||
| 2 | #include "../edid.h" | 5 | #include "../edid.h" |
| 3 | 6 | ||
| 4 | static struct fb_var_screeninfo radeonfb_default_var = { | 7 | static struct fb_var_screeninfo radeonfb_default_var = { |