Oh, and the 3.1 kernel will be including the following new symbols as well: CONFIG_OLPC_XO1_PM=y CONFIG_OLPC_XO1_RTC=y CONFIG_OLPC_XO1_SCI=y CONFIG_OLPC_XO15_SCI=y It would be nice to have those in -486 as well. The -686-pae kernel won't be used for OLPC, because PAE conflicts with it. So, despite both XO-1 and XO-1.5 machines being closer to 686, the -486 image will be required.