projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'torvalds/master'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
drm_agpsupport.c
diff --git
a/drivers/gpu/drm/drm_agpsupport.c
b/drivers/gpu/drm/drm_agpsupport.c
index 4b2b4aa5033ba1d6988f4f2c7dfc1ae605d82da5..a10ea6aec6291f4c233a0b1d49a12fcbace37f17 100644
(file)
--- a/
drivers/gpu/drm/drm_agpsupport.c
+++ b/
drivers/gpu/drm/drm_agpsupport.c
@@
-36,8
+36,6
@@
#include <linux/slab.h>
#include "drm_legacy.h"
-#if __OS_HAS_AGP
-
#include <asm/agp.h>
/**
@@
-502,5
+500,3
@@
drm_agp_bind_pages(struct drm_device *dev,
return mem;
}
EXPORT_SYMBOL(drm_agp_bind_pages);
-
-#endif /* __OS_HAS_AGP */