diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 22:06:39 +0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 22:06:39 +0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/leds/led-core.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
| download | linux-f28e71617ddaf2483e3e5c5237103484a303743f.tar.xz | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/leds/led-core.c')
| -rw-r--r-- | drivers/leds/led-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c index fe6541326c71..9b015f9af351 100644 --- a/drivers/leds/led-core.c +++ b/drivers/leds/led-core.c @@ -18,7 +18,7 @@ #include <linux/leds.h> #include "leds.h" -rwlock_t leds_list_lock = RW_LOCK_UNLOCKED; +DEFINE_RWLOCK(leds_list_lock); LIST_HEAD(leds_list); EXPORT_SYMBOL_GPL(leds_list); |