Skip to content

L
linux
Commit 2f7fc60d authored by Dave Airlie's avatar Dave Airlie
Browse files
Options

Merge bk://drm.bkbits.net/drm-linus 

into starflyer.(none):/foo/airlied/bitkeeper/drm-latest
parents f126deef 99826a0e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
drivers/char/drm/drm_memory.h
View file @ 2f7fc60d
...@@ -57,8 +57,6 @@ ...@@ -57,8 +57,6 @@
# endif # endif
#endif #endif
#include <asm/tlbflush.h>
/* /*
* Find the drm_map that covers the range [offset, offset+size). * Find the drm_map that covers the range [offset, offset+size).
*/ */
......
drivers/char/drm/drm_sysfs.c
View file @ 2f7fc60d
...@@ -32,7 +32,7 @@ struct simple_dev { ...@@ -32,7 +32,7 @@ struct simple_dev {
#define to_simple_dev(d) container_of(d, struct simple_dev, class_dev) #define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)
static LIST_HEAD(simple_dev_list); static LIST_HEAD(simple_dev_list);
static spinlock_t simple_dev_list_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(simple_dev_list_lock);
static void release_simple_dev(struct class_device *class_dev) static void release_simple_dev(struct class_device *class_dev)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7