projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
devices.c
diff --git
a/arch/arm/mach-omap1/devices.c
b/arch/arm/mach-omap1/devices.c
index
8c8be86
..
baaf902
100644
(file)
--- a/
arch/arm/mach-omap1/devices.c
+++ b/
arch/arm/mach-omap1/devices.c
@@
-33,7
+33,7
@@
#include "mmc.h"
#include "sram.h"
#include "mmc.h"
#include "sram.h"
-#if
defined(CONFIG_RTC_DRV_OMAP) || defined(CONFIG_RTC_DRV_OMAP_MODULE
)
+#if
IS_ENABLED(CONFIG_RTC_DRV_OMAP
)
#define OMAP_RTC_BASE 0xfffb4800
#define OMAP_RTC_BASE 0xfffb4800
@@
-72,7
+72,7
@@
static inline void omap_init_mbox(void) { }
/*-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------*/
-#if
defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE
)
+#if
IS_ENABLED(CONFIG_MMC_OMAP
)
static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
int controller_nr)
static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
int controller_nr)
@@
-230,7
+230,7
@@
void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
/*-------------------------------------------------------------------------*/
/* OMAP7xx SPI support */
/*-------------------------------------------------------------------------*/
/* OMAP7xx SPI support */
-#if
defined(CONFIG_SPI_OMAP_100K) || defined(CONFIG_SPI_OMAP_100K_MODULE
)
+#if
IS_ENABLED(CONFIG_SPI_OMAP_100K
)
struct platform_device omap_spi1 = {
.name = "omap1_spi100k",
struct platform_device omap_spi1 = {
.name = "omap1_spi100k",
@@
-312,7
+312,7
@@
static inline void omap_init_sti(void) {}
* mcbsp1..3 = 5..7
*/
* mcbsp1..3 = 5..7
*/
-#if
defined(CONFIG_SPI_OMAP_UWIRE) || defined(CONFIG_SPI_OMAP_UWIRE_MODUL
E)
+#if
IS_ENABLED(CONFIG_SPI_OMAP_UWIR
E)
#define OMAP_UWIRE_BASE 0xfffb3000
#define OMAP_UWIRE_BASE 0xfffb3000
@@
-418,7
+418,7
@@
static int __init omap1_init_devices(void)
}
arch_initcall(omap1_init_devices);
}
arch_initcall(omap1_init_devices);
-#if
defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE
)
+#if
IS_ENABLED(CONFIG_OMAP_WATCHDOG
)
static struct resource wdt_resources[] = {
{
static struct resource wdt_resources[] = {
{