diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /arch/ppc/syslib/ibm44x_common.h | |
parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/ppc/syslib/ibm44x_common.h')
-rw-r--r-- | arch/ppc/syslib/ibm44x_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/syslib/ibm44x_common.h b/arch/ppc/syslib/ibm44x_common.h index c16b6a5ac6ab..b25a8995e4e9 100644 --- a/arch/ppc/syslib/ibm44x_common.h +++ b/arch/ppc/syslib/ibm44x_common.h | |||
@@ -36,7 +36,8 @@ struct ibm44x_clocks { | |||
36 | }; | 36 | }; |
37 | 37 | ||
38 | /* common 44x platform init */ | 38 | /* common 44x platform init */ |
39 | void ibm44x_platform_init(void) __init; | 39 | void ibm44x_platform_init(unsigned long r3, unsigned long r4, unsigned long r5, |
40 | unsigned long r6, unsigned long r7) __init; | ||
40 | 41 | ||
41 | /* initialize decrementer and tick-related variables */ | 42 | /* initialize decrementer and tick-related variables */ |
42 | void ibm44x_calibrate_decr(unsigned int freq) __init; | 43 | void ibm44x_calibrate_decr(unsigned int freq) __init; |