diff --git a/config-arm-imx b/config-arm-imx index 08f213cbb..88dd42b5f 100644 --- a/config-arm-imx +++ b/config-arm-imx @@ -49,7 +49,7 @@ CONFIG_HW_RANDOM_MXC_RNGA=m CONFIG_I2C_IMX=m CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_MCP23S08=m -CONFIG_GPIO_MC9S08DZ60=y +# CONFIG_GPIO_MC9S08DZ60 is not set CONFIG_DVB_TDA1004X=m CONFIG_DVB_PLL=m CONFIG_SND_IMX_SOC=m diff --git a/kernel.spec b/kernel.spec index 4e9ebddd8..1e5931c62 100644 --- a/kernel.spec +++ b/kernel.spec @@ -257,11 +257,11 @@ Summary: The Linux kernel # kernel up (versatile express), tegra, omap, imx and highbank are only built on armv7 hfp/sfp %ifnarch armv7hl armv7l +%define with_imx 0 %define with_highbank 0 %define with_omap 0 %define with_tegra 0 %endif -%define with_imx 0 # kernel-kirkwood is only built for armv5 %ifnarch armv5tel @@ -2279,6 +2279,7 @@ fi %changelog * Mon Jun 25 2012 Peter Robinson - Add patch to fix ARM OMAP build +- re-enable IMX kernel now it builds again * Mon Jun 25 2012 Justin M. Forbes - 3.5.0-0.rc4.git0.1 - Disable debugging options.