diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /arch/ppc64/kernel/iSeries_setup.c | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/ppc64/kernel/iSeries_setup.c')
| -rw-r--r-- | arch/ppc64/kernel/iSeries_setup.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c index b31962436fe3..86966ce76b58 100644 --- a/arch/ppc64/kernel/iSeries_setup.c +++ b/arch/ppc64/kernel/iSeries_setup.c | |||
| @@ -671,9 +671,6 @@ static void __init iSeries_bolt_kernel(unsigned long saddr, unsigned long eaddr) | |||
| 671 | } | 671 | } |
| 672 | } | 672 | } |
| 673 | 673 | ||
| 674 | extern unsigned long ppc_proc_freq; | ||
| 675 | extern unsigned long ppc_tb_freq; | ||
| 676 | |||
| 677 | /* | 674 | /* |
| 678 | * Document me. | 675 | * Document me. |
| 679 | */ | 676 | */ |
| @@ -772,8 +769,6 @@ static void iSeries_halt(void) | |||
| 772 | mf_power_off(); | 769 | mf_power_off(); |
| 773 | } | 770 | } |
| 774 | 771 | ||
| 775 | extern void setup_default_decr(void); | ||
| 776 | |||
| 777 | /* | 772 | /* |
| 778 | * void __init iSeries_calibrate_decr() | 773 | * void __init iSeries_calibrate_decr() |
| 779 | * | 774 | * |