diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-05 14:16:48 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-05 14:16:48 +1100 |
| commit | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (patch) | |
| tree | d327446284dcce52ad3ea54ffe8a7dddfcb8b86d /arch/powerpc/platforms/83xx/mpc832x_rdb.c | |
| parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) | |
| parent | 068e8c9d02ee37c44a4d65279b3ae8188fb09e18 (diff) | |
Merge commit 'kumar/kumar-next' into next
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc832x_rdb.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index 0300268ce5b..2a1295f1983 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c @@ -38,6 +38,7 @@ #define DBG(fmt...) #endif +#ifdef CONFIG_QUICC_ENGINE static void mpc83xx_spi_activate_cs(u8 cs, u8 polarity) { pr_debug("%s %d %d\n", __func__, cs, polarity); @@ -77,8 +78,8 @@ static int __init mpc832x_spi_init(void) mpc83xx_spi_activate_cs, mpc83xx_spi_deactivate_cs); } - machine_device_initcall(mpc832x_rdb, mpc832x_spi_init); +#endif /* CONFIG_QUICC_ENGINE */ /* ************************************************************************ * @@ -130,7 +131,7 @@ static int __init mpc832x_declare_of_platform_devices(void) } machine_device_initcall(mpc832x_rdb, mpc832x_declare_of_platform_devices); -void __init mpc832x_rdb_init_IRQ(void) +static void __init mpc832x_rdb_init_IRQ(void) { struct device_node *np; |