git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[sfrench/cifs-2.6.git]
/
drivers
/
video
/
aty
/
radeon_pm.c
diff --git
a/drivers/video/aty/radeon_pm.c
b/drivers/video/aty/radeon_pm.c
index 365de5dcc888edf9c37766276f091ae689da648e..9a2b0d69b0ae7ebdb8bc0dac91a686e986c27f11 100644
(file)
--- a/
drivers/video/aty/radeon_pm.c
+++ b/
drivers/video/aty/radeon_pm.c
@@
-86,6
+86,9
@@
static struct radeon_device_id radeon_workaround_list[] = {
BUGFIX("Samsung P35",
PCI_VENDOR_ID_SAMSUNG, 0xc00c,
radeon_pm_off, radeon_reinitialize_M10),
+ BUGFIX("Acer Aspire 2010",
+ PCI_VENDOR_ID_AI, 0x0061,
+ radeon_pm_off, radeon_reinitialize_M10),
{ .ident = NULL }
};