projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-2.6' into for-linus
[linux-2.6-block.git]
/
arch
/
powerpc
/
kernel
/
setup_32.c
diff --git
a/arch/powerpc/kernel/setup_32.c
b/arch/powerpc/kernel/setup_32.c
index a4c2964a3ca6b325f86a52eb1c7880c534ff43d7..04df53a3c86dc4b4c78e9407ae509ea602a7518c 100644
(file)
--- a/
arch/powerpc/kernel/setup_32.c
+++ b/
arch/powerpc/kernel/setup_32.c
@@
-63,10
+63,6
@@
unsigned int DMA_MODE_WRITE;
int have_of = 1;
-#ifdef CONFIG_PPC_MULTIPLATFORM
-dev_t boot_dev;
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
#ifdef CONFIG_VGA_CONSOLE
unsigned long vgacon_remap_base;
#endif