diff options
| author | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
| commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
| tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /include/asm-s390/hardirq.h | |
| parent | 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/asm-s390/hardirq.h')
| -rw-r--r-- | include/asm-s390/hardirq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/hardirq.h b/include/asm-s390/hardirq.h index c2f6a8782d31..31beb18cb3d1 100644 --- a/include/asm-s390/hardirq.h +++ b/include/asm-s390/hardirq.h | |||
| @@ -32,6 +32,6 @@ typedef struct { | |||
| 32 | 32 | ||
| 33 | #define HARDIRQ_BITS 8 | 33 | #define HARDIRQ_BITS 8 |
| 34 | 34 | ||
| 35 | extern void account_ticks(void); | 35 | extern void account_ticks(u64 time); |
| 36 | 36 | ||
| 37 | #endif /* __ASM_HARDIRQ_H */ | 37 | #endif /* __ASM_HARDIRQ_H */ |