diff options
Diffstat (limited to 'arch/ppc/platforms/pmac_setup.c')
-rw-r--r-- | arch/ppc/platforms/pmac_setup.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c index b392b9a15987..d6356f480d90 100644 --- a/arch/ppc/platforms/pmac_setup.c +++ b/arch/ppc/platforms/pmac_setup.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include <linux/adb.h> | 48 | #include <linux/adb.h> |
49 | #include <linux/cuda.h> | 49 | #include <linux/cuda.h> |
50 | #include <linux/pmu.h> | 50 | #include <linux/pmu.h> |
51 | #include <linux/irq.h> | ||
52 | #include <linux/seq_file.h> | 51 | #include <linux/seq_file.h> |
53 | #include <linux/root_dev.h> | 52 | #include <linux/root_dev.h> |
54 | #include <linux/bitops.h> | 53 | #include <linux/bitops.h> |
@@ -719,7 +718,8 @@ pmac_declare_of_platform_devices(void) | |||
719 | if (np) { | 718 | if (np) { |
720 | for (np = np->child; np != NULL; np = np->sibling) | 719 | for (np = np->child; np != NULL; np = np->sibling) |
721 | if (strncmp(np->name, "i2c", 3) == 0) { | 720 | if (strncmp(np->name, "i2c", 3) == 0) { |
722 | of_platform_device_create(np, "uni-n-i2c"); | 721 | of_platform_device_create(np, "uni-n-i2c", |
722 | NULL); | ||
723 | break; | 723 | break; |
724 | } | 724 | } |
725 | } | 725 | } |
@@ -727,17 +727,18 @@ pmac_declare_of_platform_devices(void) | |||
727 | if (np) { | 727 | if (np) { |
728 | for (np = np->child; np != NULL; np = np->sibling) | 728 | for (np = np->child; np != NULL; np = np->sibling) |
729 | if (strncmp(np->name, "i2c", 3) == 0) { | 729 | if (strncmp(np->name, "i2c", 3) == 0) { |
730 | of_platform_device_create(np, "u3-i2c"); | 730 | of_platform_device_create(np, "u3-i2c", |
731 | NULL); | ||
731 | break; | 732 | break; |
732 | } | 733 | } |
733 | } | 734 | } |
734 | 735 | ||
735 | np = find_devices("valkyrie"); | 736 | np = find_devices("valkyrie"); |
736 | if (np) | 737 | if (np) |
737 | of_platform_device_create(np, "valkyrie"); | 738 | of_platform_device_create(np, "valkyrie", NULL); |
738 | np = find_devices("platinum"); | 739 | np = find_devices("platinum"); |
739 | if (np) | 740 | if (np) |
740 | of_platform_device_create(np, "platinum"); | 741 | of_platform_device_create(np, "platinum", NULL); |
741 | 742 | ||
742 | return 0; | 743 | return 0; |
743 | } | 744 | } |