aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac/setup.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
commitd6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch)
treeeeec5011a42f38d3dfe7b61788b7ac1cc890edeb /arch/powerpc/platforms/powermac/setup.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff)
parent[PATCH] powerpc: Add FSL USB node to documentation (diff)
downloadlinux-dev-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.xz
linux-dev-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.zip
Merge ../powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/powermac/setup.c')
-rw-r--r--arch/powerpc/platforms/powermac/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 616b1e3ebe04..97c54e19c1b5 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -82,8 +82,6 @@
#undef SHOW_GATWICK_IRQS
-unsigned char drive_info;
-
int ppc_override_l2cr = 0;
int ppc_override_l2cr_value;
int has_l2cache = 0;