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/btext.c | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/ppc/syslib/btext.c')
| -rw-r--r-- | arch/ppc/syslib/btext.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/syslib/btext.c b/arch/ppc/syslib/btext.c index 7734f6836174..12fa83e6774a 100644 --- a/arch/ppc/syslib/btext.c +++ b/arch/ppc/syslib/btext.c | |||
| @@ -53,8 +53,8 @@ extern char *klimit; | |||
| 53 | * chrp only uses it during early boot. | 53 | * chrp only uses it during early boot. |
| 54 | */ | 54 | */ |
| 55 | #ifdef CONFIG_XMON | 55 | #ifdef CONFIG_XMON |
| 56 | #define BTEXT __pmac | 56 | #define BTEXT |
| 57 | #define BTDATA __pmacdata | 57 | #define BTDATA |
| 58 | #else | 58 | #else |
| 59 | #define BTEXT __init | 59 | #define BTEXT __init |
| 60 | #define BTDATA __initdata | 60 | #define BTDATA __initdata |
| @@ -187,7 +187,7 @@ btext_setup_display(int width, int height, int depth, int pitch, | |||
| 187 | * changes. | 187 | * changes. |
| 188 | */ | 188 | */ |
| 189 | 189 | ||
| 190 | void __openfirmware | 190 | void |
| 191 | map_boot_text(void) | 191 | map_boot_text(void) |
| 192 | { | 192 | { |
| 193 | unsigned long base, offset, size; | 193 | unsigned long base, offset, size; |