summaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight/hp680_bl.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-06-29 22:01:54 +0200
committerDave Jones <davej@redhat.com>2006-06-29 22:01:54 +0200
commit55b4d6a52195a8f277ffddf755ddaff359878f41 (patch)
tree06a3183a562f8da4688f65023f7a18dcad702956 /drivers/video/backlight/hp680_bl.c
parent[AGPGART] Make AGP depend on PCI (diff)
parent[PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff)
downloadlinux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz
linux-55b4d6a52195a8f277ffddf755ddaff359878f41.zip
Merge ../linus
Conflicts: drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/video/backlight/hp680_bl.c')
-rw-r--r--drivers/video/backlight/hp680_bl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index a71e984c93d4..ffc72ae3ada8 100644
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -27,7 +27,7 @@
static int hp680bl_suspended;
static int current_intensity = 0;
-static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(bl_lock);
static struct backlight_device *hp680_backlight_device;
static void hp680bl_send_intensity(struct backlight_device *bd)