From: Tony Lindgren Date: Fri, 29 Jun 2012 13:07:08 +0000 (-0700) Subject: Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6f1f12f6d4e9e4a44587e58ec96db25673083ec;p=linux-beck.git Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-critical Some OMAP AM35xx fixes. The powerdomain and clockdomain data for the AM35xx are finally fixed. The AM35xx EMAC/MDIO Ethernet controller integration code has been converted to use the OMAP device and hwmod framework. Also the UART4 and HSOTGUSB warnings have been fixed. --- f6f1f12f6d4e9e4a44587e58ec96db25673083ec diff --cc arch/arm/plat-omap/include/plat/cpu.h index e79e913d95de,de6c0a08f461..430081ac0c47 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@@ -273,10 -275,10 +271,8 @@@ IS_OMAP_TYPE(2422, 0x2422 IS_OMAP_TYPE(2423, 0x2423) IS_OMAP_TYPE(2430, 0x2430) IS_OMAP_TYPE(3430, 0x3430) - IS_OMAP_TYPE(3505, 0x3517) - IS_OMAP_TYPE(3517, 0x3517) #define cpu_is_omap310() 0 -#define cpu_is_omap730() 0 -#define cpu_is_omap850() 0 #define cpu_is_omap1510() 0 #define cpu_is_omap1610() 0 #define cpu_is_omap5912() 0