9
0
Fork 0
Commit Graph

5 Commits

Author SHA1 Message Date
Sascha Hauer 038be0fbb5 Merge branch 'for-next/usb' 2014-08-07 13:13:47 +02:00
Sascha Hauer c1016b29f7 ARM: AM3355x: Update defconfig
Most diffstat comes from refreshing the config. The only real change
is that the NAND xload update handler is enabled now.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-08-01 15:24:39 +02:00
Sascha Hauer 4a872ae0ff USB: Kconfig: introduce USB_HOST symbol
This renames USB to USB_HOST since this is what the symbol really
means. Introduce a USB symbol which is selected by both USB_GADGET
and USB_HOST. This gives us a symbol to let common USB code depend
on.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-07-18 14:42:35 +02:00
Sascha Hauer 7ccfe4d3a0 Merge branch 'for-next/omap'
Conflicts:
	arch/arm/configs/am335x_beaglebone_defconfig
	arch/arm/configs/am335x_defconfig
2014-06-04 21:04:04 +02:00
Sascha Hauer 3970661a00 ARM: AM335x: merge am335x config in a single config file
The current am335x boards can be built together. Merge the
configs to a single am335x_defconfig.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-15 13:56:17 +02:00