summaryrefslogtreecommitdiffstats
path: root/drivers/video/geode/display_gx1.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-09 20:14:47 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-09 20:14:47 -0500
commitd344c5e0856ad03278d8700b503762dbc8b86e12 (patch)
treea6d893a643470a3c2580a58f3228a55fa1fd1d82 /drivers/video/geode/display_gx1.c
parent010988e888a0abbe7118635c1b33d049caae6b29 (diff)
parent87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff)
downloadop-kernel-dev-d344c5e0856ad03278d8700b503762dbc8b86e12.zip
op-kernel-dev-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.gz
Manual merge with Linus
Diffstat (limited to 'drivers/video/geode/display_gx1.c')
-rw-r--r--drivers/video/geode/display_gx1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/geode/display_gx1.c b/drivers/video/geode/display_gx1.c
index f498387..926d53e 100644
--- a/drivers/video/geode/display_gx1.c
+++ b/drivers/video/geode/display_gx1.c
@@ -22,7 +22,7 @@
#include "geodefb.h"
#include "display_gx1.h"
-static spinlock_t gx1_conf_reg_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(gx1_conf_reg_lock);
static u8 gx1_read_conf_reg(u8 reg)
{
OpenPOWER on IntegriCloud