diff options
author | David Miller <davem@davemloft.net> | 2010-03-03 05:50:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-19 10:17:54 -0400 |
commit | f157b58511e56d418eb582de96fedc4ea03d8061 (patch) | |
tree | 3970689b55694714db91112afcc4e3f3f4dd4601 /drivers/serial | |
parent | 352fa6ad16b89f8ffd1a93b4419b1a8f2259feab (diff) |
uartlite: Fix build on sparc.
We can get this driver enabled via MFD_TIMBERDALE which only
requires GPIO to be on.
But the of_address_to_resource() function is only present on
powerpc and microblaze, so we have to conditionalize the
CONFIG_OF probing bits on that.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/uartlite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index ab2ab3c81834..f0a6c61b17f7 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #if defined(CONFIG_OF) | 22 | #if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE)) |
23 | #include <linux/of.h> | 23 | #include <linux/of.h> |
24 | #include <linux/of_device.h> | 24 | #include <linux/of_device.h> |
25 | #include <linux/of_platform.h> | 25 | #include <linux/of_platform.h> |
@@ -581,7 +581,7 @@ static struct platform_driver ulite_platform_driver = { | |||
581 | /* --------------------------------------------------------------------- | 581 | /* --------------------------------------------------------------------- |
582 | * OF bus bindings | 582 | * OF bus bindings |
583 | */ | 583 | */ |
584 | #if defined(CONFIG_OF) | 584 | #if defined(CONFIG_OF) && (defined(CONFIG_PPC32) || defined(CONFIG_MICROBLAZE)) |
585 | static int __devinit | 585 | static int __devinit |
586 | ulite_of_probe(struct of_device *op, const struct of_device_id *match) | 586 | ulite_of_probe(struct of_device *op, const struct of_device_id *match) |
587 | { | 587 | { |
@@ -631,11 +631,11 @@ static inline void __exit ulite_of_unregister(void) | |||
631 | { | 631 | { |
632 | of_unregister_platform_driver(&ulite_of_driver); | 632 | of_unregister_platform_driver(&ulite_of_driver); |
633 | } | 633 | } |
634 | #else /* CONFIG_OF */ | 634 | #else /* CONFIG_OF && (CONFIG_PPC32 || CONFIG_MICROBLAZE) */ |
635 | /* CONFIG_OF not enabled; do nothing helpers */ | 635 | /* Appropriate config not enabled; do nothing helpers */ |
636 | static inline int __init ulite_of_register(void) { return 0; } | 636 | static inline int __init ulite_of_register(void) { return 0; } |
637 | static inline void __exit ulite_of_unregister(void) { } | 637 | static inline void __exit ulite_of_unregister(void) { } |
638 | #endif /* CONFIG_OF */ | 638 | #endif /* CONFIG_OF && (CONFIG_PPC32 || CONFIG_MICROBLAZE) */ |
639 | 639 | ||
640 | /* --------------------------------------------------------------------- | 640 | /* --------------------------------------------------------------------- |
641 | * Module setup/teardown | 641 | * Module setup/teardown |