Merge branch 'for_2.6.34_b' of git://git.pwsan.com/linux-2.6 into omap-for-linus
This commit is contained in:
@@ -177,6 +177,8 @@ void __init omap3_check_features(void)
|
||||
OMAP3_CHECK_FEATURE(status, SGX);
|
||||
OMAP3_CHECK_FEATURE(status, NEON);
|
||||
OMAP3_CHECK_FEATURE(status, ISP);
|
||||
if (cpu_is_omap3630())
|
||||
omap3_features |= OMAP3_HAS_192MHZ_CLK;
|
||||
|
||||
/*
|
||||
* TODO: Get additional info (where applicable)
|
||||
@@ -361,6 +363,7 @@ void __init omap3_cpuinfo(void)
|
||||
OMAP3_SHOW_FEATURE(sgx);
|
||||
OMAP3_SHOW_FEATURE(neon);
|
||||
OMAP3_SHOW_FEATURE(isp);
|
||||
OMAP3_SHOW_FEATURE(192mhz_clk);
|
||||
|
||||
printk(")\n");
|
||||
}
|
||||
|
Reference in New Issue
Block a user