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 drm/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
pm
/
powerplay
/
hwmgr
/
smu7_hwmgr.c
diff --git
a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
index 6dd33a2cd987085fb3273c195a955c3cfbc768ff..a2e1f6ed525f12566e7643c39fe51540115cd64b 100644
(file)
--- a/
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+++ b/
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
@@
-22,7
+22,6
@@
*/
#include "pp_debug.h"
#include <linux/delay.h>
-#include <linux/fb.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/slab.h>