1 files changed, 6 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 677357ff61ac..d95f727ca39a 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -20,19 +20,16 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/usb/musb.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/mtd-onenand-omap2.h>
 #include <sound/tlv320aic3x.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
-#include <plat/board.h>
 #include "common.h"
 #include <plat/menelaus.h>
-#include <mach/irqs.h>
-#include <plat/mcspi.h>
-#include <plat/onenand.h>
 #include <plat/mmc.h>
-#include <plat/serial.h>
 
 #include "mux.h"
 
@@ -553,8 +550,8 @@ static int n8x0_auto_sleep_regulators(void)
 
         ret = menelaus_set_regulator_sleep(1, val);
         if (ret < 0) {
-                printk(KERN_ERR "Could not set regulators to sleep on "
-                        "menelaus: %u\n", ret);
+                pr_err("Could not set regulators to sleep on menelaus: %u\n",
+                       ret);
                 return ret;
         }
         return 0;
@@ -566,8 +563,7 @@ static int n8x0_auto_voltage_scale(void)
 
         ret = menelaus_set_vcore_hw(1400, 1050);
         if (ret < 0) {
-                printk(KERN_ERR "Could not set VCORE voltage on "
-                        "menelaus: %u\n", ret);
+                pr_err("Could not set VCORE voltage on menelaus: %u\n", ret);
                 return ret;
         }
         return 0;
@@ -600,7 +596,7 @@ static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
 static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = {
         {
                 I2C_BOARD_INFO("menelaus", 0x72),
-                .irq = INT_24XX_SYS_NIRQ,
+                .irq = 7 + OMAP_INTC_START,
                 .platform_data = &n8x0_menelaus_platform_data,
         },
 };