diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-14 01:02:32 -0500 |
commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
tree | 189969a3689b9b83eaf39314a7942cc781ff836b /drivers/macintosh/adbhid.c | |
parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/macintosh/adbhid.c')
-rw-r--r-- | drivers/macintosh/adbhid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 1c7d6f221b55..b77ef5187d6d 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
@@ -574,8 +574,8 @@ static struct adb_request led_request; | |||
574 | static int leds_pending[16]; | 574 | static int leds_pending[16]; |
575 | static int leds_req_pending; | 575 | static int leds_req_pending; |
576 | static int pending_devs[16]; | 576 | static int pending_devs[16]; |
577 | static int pending_led_start=0; | 577 | static int pending_led_start; |
578 | static int pending_led_end=0; | 578 | static int pending_led_end; |
579 | static DEFINE_SPINLOCK(leds_lock); | 579 | static DEFINE_SPINLOCK(leds_lock); |
580 | 580 | ||
581 | static void leds_done(struct adb_request *req) | 581 | static void leds_done(struct adb_request *req) |