Merge branch 'master' of /home/sam/kernel/linux-2.6/

[pandora-kernel.git] / arch / m68knommu / platform / 5272 / config.c

diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c
index 5cb2869..d500e27 100644 (file)
--- a/arch/m68knommu/platform/5272/config.c
+++ b/arch/m68knommu/platform/5272/config.c
@@ -9,7 +9,6 @@
 
 /***************************************************************************/
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/param.h>
@@ -104,11 +103,11 @@ int mcf_timerirqpending(int timer)
 
 void config_BSP(char *commandp, int size)
 {
-#if 0
-       volatile unsigned long  *pivrp;
+#if defined (CONFIG_MOD5272)
+       volatile unsigned char  *pivrp;
 
        /* Set base of device vectors to be 64 */
-       pivrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PIVR);
+       pivrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_PIVR);
        *pivrp = 0x40;
 #endif