diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /drivers/char/tlclk.c | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/char/tlclk.c')
| -rw-r--r-- | drivers/char/tlclk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index f58ad7f68267..ef68d152d3e4 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c | |||
| @@ -343,7 +343,7 @@ static ssize_t store_received_ref_clk3b(struct device *d, | |||
| 343 | 343 | ||
| 344 | val = (unsigned char)tmp; | 344 | val = (unsigned char)tmp; |
| 345 | spin_lock_irqsave(&event_lock, flags); | 345 | spin_lock_irqsave(&event_lock, flags); |
| 346 | SET_PORT_BITS(TLCLK_REG1, 0xef, val << 1); | 346 | SET_PORT_BITS(TLCLK_REG1, 0xdf, val << 1); |
| 347 | spin_unlock_irqrestore(&event_lock, flags); | 347 | spin_unlock_irqrestore(&event_lock, flags); |
| 348 | 348 | ||
| 349 | return strnlen(buf, count); | 349 | return strnlen(buf, count); |