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

into starflyer.(none):/foo/airlied/bitkeeper/drm-latest

Merge bk://drm.bkbits.net/drm-linus
into starflyer.(none):/foo/airlied/bitkeeper/drm-latest
2f7fc60d · Dave Airlie · f126deef · 99826a0e · 2f7fc60d · 2f7fc60d
Commit 2f7fc60d authored Feb 02, 2005 by Dave Airlie
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

drivers/char/drm/drm_memory.h drivers/char/drm/drm_memory.h +0 -2

drivers/char/drm/drm_sysfs.c drivers/char/drm/drm_sysfs.c +1 -1

No files found.
--- a/drivers/char/drm/drm_memory.h
+++ b/drivers/char/drm/drm_memory.h
@@ -57,8 +57,6 @@
 # endif
 #endif

-#include <asm/tlbflush.h>
-
 /*
 * Find the drm_map that covers the range [offset, offset+size).
 */

--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -32,7 +32,7 @@ struct simple_dev {
 #define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)

 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)
 {