Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / include / asm-sparc / machines.h

diff --git a/include/asm-sparc/machines.h b/include/asm-sparc/machines.h
index d6c6bf836206fa584bc8e8ce10405c6e08c04d6e..c28c2f2487940436f97b45073683fa4ab57cc8b4 100644 (file)
--- a/include/asm-sparc/machines.h
+++ b/include/asm-sparc/machines.h
@@ -17,8 +17,6 @@ struct Sun_Machine_Models {
  */
 #define NUM_SUN_MACHINES   15
 
-extern struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES];
-
 /* The machine type in the idprom area looks like this:
  *
  * ---------------