Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

disabling pxa2xx for aspenite

  • Loading branch information...
commit e2477d7cc015a9524b45da6287379d60c953a296 1 parent c53c0e8
@jsoutherland jsoutherland authored
Showing with 10 additions and 3 deletions.
  1. +10 −3 arch/arm/mach-mmp/aspenite.c
View
13 arch/arm/mach-mmp/aspenite.c
@@ -40,12 +40,14 @@
#include <plat/pxa_u2o.h>
#include <plat/pxa3xx_otg.h>
-#define KIPR_KOVAN
-#if defined(CONFIG_SPI_PXA2XX) && !defined(KIPR_KOVAN)
+/*
+ // JBS
+#if defined(CONFIG_SPI_PXA2XX)
#include <linux/spi/spi.h>
#include <plat/pxa2xx_spi.h>
#endif
+*/
#include "common.h"
#include <linux/mmc/sdhci.h>
@@ -1016,7 +1018,9 @@ static struct pxa27x_keypad_platform_data aspenite_android_keypad_info __initdat
.debounce_interval = 30,
};
-#if (defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE) && !defined(KIPR_KOVAN)) \
+/**
+// JBS
+#if (defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MODULE)) \
&& defined(CONFIG_MTD_M25P80)
static struct pxa2xx_spi_master pxa_ssp_master_info = {
@@ -1053,6 +1057,9 @@ static void __init aspenite_init_spi(void)
#else
static inline void aspenite_init_spi(void) {}
#endif
+*//
+static inline void aspenite_init_spi(void) {}
+
#if defined(CONFIG_SAMSUNG_32G_MLC_NAND)
Please sign in to comment.
Something went wrong with that request. Please try again.