diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-30 13:46:19 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-30 13:46:19 +1100 |
commit | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (patch) | |
tree | 89ec500c03f0704799407265db21966b721c6d3f /arch/powerpc/platforms/85xx/mpc85xx_ads.c | |
parent | ec78c8ac16e7a5f45e21838ab2f5573200bfcdd3 (diff) | |
parent | df4b6806d35ca6adedd5c0a7e36ac74af1c32d7a (diff) | |
download | kernel_samsung_aries-0a3108beea9143225119d5e7c72a8e2c64f3eb7d.zip kernel_samsung_aries-0a3108beea9143225119d5e7c72a8e2c64f3eb7d.tar.gz kernel_samsung_aries-0a3108beea9143225119d5e7c72a8e2c64f3eb7d.tar.bz2 |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_ads.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ads.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index 21f0090..9438a89 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c @@ -226,6 +226,7 @@ static struct of_device_id __initdata of_bus_ids[] = { { .name = "cpm", }, { .name = "localbus", }, { .compatible = "simple-bus", }, + { .compatible = "gianfar", }, {}, }; |