diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 12:24:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 12:24:00 -0400 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /drivers/char/ds1620.c | |
| parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'drivers/char/ds1620.c')
| -rw-r--r-- | drivers/char/ds1620.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c index 34275c6f1da2..74e9cd81b5b2 100644 --- a/drivers/char/ds1620.c +++ b/drivers/char/ds1620.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/smp_lock.h> | 11 | #include <linux/smp_lock.h> |
| 12 | 12 | ||
| 13 | #include <asm/hardware.h> | 13 | #include <mach/hardware.h> |
| 14 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
| 15 | #include <asm/uaccess.h> | 15 | #include <asm/uaccess.h> |
| 16 | #include <asm/therm.h> | 16 | #include <asm/therm.h> |