diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /arch/arm/mach-omap2/Kconfig | |
| parent | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff) | |
| parent | b07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff) | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 503414718905..e1293aa513d3 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -334,6 +334,7 @@ config MACH_OMAP4_PANDA | |||
| 334 | config OMAP3_EMU | 334 | config OMAP3_EMU |
| 335 | bool "OMAP3 debugging peripherals" | 335 | bool "OMAP3 debugging peripherals" |
| 336 | depends on ARCH_OMAP3 | 336 | depends on ARCH_OMAP3 |
| 337 | select ARM_AMBA | ||
| 337 | select OC_ETM | 338 | select OC_ETM |
| 338 | help | 339 | help |
| 339 | Say Y here to enable debugging hardware of omap3 | 340 | Say Y here to enable debugging hardware of omap3 |