git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
btext.c
diff --git
a/arch/ppc/syslib/btext.c
b/arch/ppc/syslib/btext.c
index
7734f68
..
12fa83e
100644
(file)
--- a/
arch/ppc/syslib/btext.c
+++ b/
arch/ppc/syslib/btext.c
@@
-53,8
+53,8
@@
extern char *klimit;
* chrp only uses it during early boot.
*/
#ifdef CONFIG_XMON
* chrp only uses it during early boot.
*/
#ifdef CONFIG_XMON
-#define BTEXT
__pmac
-#define BTDATA
__pmacdata
+#define BTEXT
+#define BTDATA
#else
#define BTEXT __init
#define BTDATA __initdata
#else
#define BTEXT __init
#define BTDATA __initdata
@@
-187,7
+187,7
@@
btext_setup_display(int width, int height, int depth, int pitch,
* changes.
*/
* changes.
*/
-void
__openfirmware
+void
map_boot_text(void)
{
unsigned long base, offset, size;
map_boot_text(void)
{
unsigned long base, offset, size;