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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
btext.c
diff --git
a/arch/ppc/syslib/btext.c
b/arch/ppc/syslib/btext.c
index
e3f9e8e
..
d116670
100644
(file)
--- a/
arch/ppc/syslib/btext.c
+++ b/
arch/ppc/syslib/btext.c
@@
-3,11
+3,10
@@
*
* Benjamin Herrenschmidt <benh@kernel.crashing.org>
*/
*
* Benjamin Herrenschmidt <benh@kernel.crashing.org>
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
-#include <linux/
version
.h>
+#include <linux/
utsrelease
.h>
#include <asm/sections.h>
#include <asm/bootx.h>
#include <asm/sections.h>
#include <asm/bootx.h>
@@
-53,8
+52,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
@@
-137,7
+136,7
@@
btext_prepare_BAT(void)
boot_text_mapped = 0;
return;
}
boot_text_mapped = 0;
return;
}
- if (PVR_VER(mfspr(PVR)) != 1) {
+ if (PVR_VER(mfspr(
SPRN_
PVR)) != 1) {
/* 603, 604, G3, G4, ... */
lowbits = addr & ~0xFF000000UL;
addr &= 0xFF000000UL;
/* 603, 604, G3, G4, ... */
lowbits = addr & ~0xFF000000UL;
addr &= 0xFF000000UL;
@@
-187,7
+186,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;