git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
auxio_32.c
diff --git
a/arch/sparc/kernel/auxio_32.c
b/arch/sparc/kernel/auxio_32.c
index
ee8d214
..
35f4883
100644
(file)
--- a/
arch/sparc/kernel/auxio_32.c
+++ b/
arch/sparc/kernel/auxio_32.c
@@
-23,7
+23,7
@@
static DEFINE_SPINLOCK(auxio_lock);
void __init auxio_probe(void)
{
void __init auxio_probe(void)
{
-
int
node, auxio_nd;
+
phandle
node, auxio_nd;
struct linux_prom_registers auxregs[1];
struct resource r;
struct linux_prom_registers auxregs[1];
struct resource r;
@@
-113,7
+113,7
@@
volatile unsigned char * auxio_power_register = NULL;
void __init auxio_power_probe(void)
{
struct linux_prom_registers regs;
void __init auxio_power_probe(void)
{
struct linux_prom_registers regs;
-
int
node;
+
phandle
node;
struct resource r;
/* Attempt to find the sun4m power control node. */
struct resource r;
/* Attempt to find the sun4m power control node. */