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
/
prep_nvram.c
diff --git
a/arch/ppc/syslib/prep_nvram.c
b/arch/ppc/syslib/prep_nvram.c
index
2bcf8a1
..
474dccb
100644
(file)
--- a/
arch/ppc/syslib/prep_nvram.c
+++ b/
arch/ppc/syslib/prep_nvram.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/kernel/prep_nvram.c
- *
* Copyright (C) 1998 Corey Minyard
*
* This reads the NvRAM on PReP compliant machines (generally from IBM or
* Copyright (C) 1998 Corey Minyard
*
* This reads the NvRAM on PReP compliant machines (generally from IBM or
@@
-15,7
+13,6
@@
#include <linux/ioport.h>
#include <asm/sections.h>
#include <linux/ioport.h>
#include <asm/sections.h>
-#include <asm/segment.h>
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/prep_nvram.h>
#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/prep_nvram.h>
@@
-23,14
+20,14
@@
static char nvramData[MAX_PREP_NVRAM];
static NVRAM_MAP *nvram=(NVRAM_MAP *)&nvramData[0];
static char nvramData[MAX_PREP_NVRAM];
static NVRAM_MAP *nvram=(NVRAM_MAP *)&nvramData[0];
-unsigned char
__prep
prep_nvram_read_val(int addr)
+unsigned char prep_nvram_read_val(int addr)
{
outb(addr, PREP_NVRAM_AS0);
outb(addr>>8, PREP_NVRAM_AS1);
return inb(PREP_NVRAM_DATA);
}
{
outb(addr, PREP_NVRAM_AS0);
outb(addr>>8, PREP_NVRAM_AS1);
return inb(PREP_NVRAM_DATA);
}
-void
__prep
prep_nvram_write_val(int addr,
+void prep_nvram_write_val(int addr,
unsigned char val)
{
outb(addr, PREP_NVRAM_AS0);
unsigned char val)
{
outb(addr, PREP_NVRAM_AS0);
@@
-82,8
+79,7
@@
void __init init_prep_nvram(void)
}
}
}
}
-__prep
-char __prep *prep_nvram_get_var(const char *name)
+char *prep_nvram_get_var(const char *name)
{
char *cp;
int namelen;
{
char *cp;
int namelen;
@@
-102,8
+98,7
@@
char __prep *prep_nvram_get_var(const char *name)
return NULL;
}
return NULL;
}
-__prep
-char __prep *prep_nvram_first_var(void)
+char *prep_nvram_first_var(void)
{
if (nvram->Header.GELength == 0) {
return NULL;
{
if (nvram->Header.GELength == 0) {
return NULL;
@@
-113,8
+108,7
@@
char __prep *prep_nvram_first_var(void)
}
}
}
}
-__prep
-char __prep *prep_nvram_next_var(char *name)
+char *prep_nvram_next_var(char *name)
{
char *cp;
{
char *cp;