diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /sound/oss/pas2_card.c | |
| parent | 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
Diffstat (limited to 'sound/oss/pas2_card.c')
| -rw-r--r-- | sound/oss/pas2_card.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index 25f3a22c52ee..7f377ec3486d 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c | |||
| @@ -156,9 +156,7 @@ static int __init config_pas_hw(struct address_info *hw_config) | |||
| 156 | * 0x80 | 156 | * 0x80 |
| 157 | */ , 0xB88); | 157 | */ , 0xB88); |
| 158 | 158 | ||
| 159 | pas_write(0x80 | 159 | pas_write(0x80 | (joystick ? 0x40 : 0), 0xF388); |
| 160 | | joystick?0x40:0 | ||
| 161 | ,0xF388); | ||
| 162 | 160 | ||
| 163 | if (pas_irq < 0 || pas_irq > 15) | 161 | if (pas_irq < 0 || pas_irq > 15) |
| 164 | { | 162 | { |