diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
| commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
| tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /drivers/hwmon/hdaps.c | |
| parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'drivers/hwmon/hdaps.c')
| -rw-r--r-- | drivers/hwmon/hdaps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c index 50f22690d611..a4d92d246d52 100644 --- a/drivers/hwmon/hdaps.c +++ b/drivers/hwmon/hdaps.c | |||
| @@ -581,6 +581,8 @@ static int __init hdaps_init(void) | |||
| 581 | /* initialize the input class */ | 581 | /* initialize the input class */ |
| 582 | idev = hdaps_idev->input; | 582 | idev = hdaps_idev->input; |
| 583 | idev->name = "hdaps"; | 583 | idev->name = "hdaps"; |
| 584 | idev->phys = "isa1600/input0"; | ||
| 585 | idev->id.bustype = BUS_ISA; | ||
| 584 | idev->dev.parent = &pdev->dev; | 586 | idev->dev.parent = &pdev->dev; |
| 585 | idev->evbit[0] = BIT_MASK(EV_ABS); | 587 | idev->evbit[0] = BIT_MASK(EV_ABS); |
| 586 | input_set_abs_params(idev, ABS_X, | 588 | input_set_abs_params(idev, ABS_X, |