diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 18:57:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 18:57:35 -0400 |
commit | 03c0c29aff7e56b722eb6c47eace222b140d0377 (patch) | |
tree | 47267a19b523159cf36a050ef3c35f4dbdb33016 /drivers/net/niu.c | |
parent | c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4 (diff) | |
parent | 7fb8f881c54beb05dd4d2c947dada1c636581d87 (diff) |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
of/platform: Register of_platform_drivers with an "of:" prefix
of/address: Clean up function declarations
of/spi: call of_register_spi_devices() from spi core code
of: Provide default of_node_to_nid() implementation.
of/device: Make of_device_make_bus_id() usable by other code.
of/irq: Fix endian issues in parsing interrupt specifiers
of: Fix phandle endian issues
of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
of: remove of_default_bus_ids
of: make of_find_device_by_node generic
microblaze: remove references to of_device and to_of_device
sparc: remove references to of_device and to_of_device
powerpc: remove references to of_device and to_of_device
of/device: Replace of_device with platform_device in includes and core code
of/device: Protect against binding of_platform_drivers to non-OF devices
of: remove asm/of_device.h
of: remove asm/of_platform.h
of/platform: remove all of_bus_type and of_platform_bus_type references
of: Merge of_platform_bus_type with platform_bus_type
drivercore/of: Add OF style matching to platform bus
...
Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
some obj-y removals by the devicetree branch, while the microblaze
updates added a new file.
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index b9b950845b0e..404f2d552888 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -28,10 +28,7 @@ | |||
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | 29 | ||
30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
31 | |||
32 | #ifdef CONFIG_SPARC64 | ||
33 | #include <linux/of_device.h> | 31 | #include <linux/of_device.h> |
34 | #endif | ||
35 | 32 | ||
36 | #include "niu.h" | 33 | #include "niu.h" |
37 | 34 | ||
@@ -9114,12 +9111,12 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map) | |||
9114 | if (!int_prop) | 9111 | if (!int_prop) |
9115 | return -ENODEV; | 9112 | return -ENODEV; |
9116 | 9113 | ||
9117 | for (i = 0; i < op->num_irqs; i++) { | 9114 | for (i = 0; i < op->archdata.num_irqs; i++) { |
9118 | ldg_num_map[i] = int_prop[i]; | 9115 | ldg_num_map[i] = int_prop[i]; |
9119 | np->ldg[i].irq = op->irqs[i]; | 9116 | np->ldg[i].irq = op->archdata.irqs[i]; |
9120 | } | 9117 | } |
9121 | 9118 | ||
9122 | np->num_ldg = op->num_irqs; | 9119 | np->num_ldg = op->archdata.num_irqs; |
9123 | 9120 | ||
9124 | return 0; | 9121 | return 0; |
9125 | #else | 9122 | #else |
@@ -10249,14 +10246,14 @@ static int __init niu_init(void) | |||
10249 | niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT); | 10246 | niu_debug = netif_msg_init(debug, NIU_MSG_DEFAULT); |
10250 | 10247 | ||
10251 | #ifdef CONFIG_SPARC64 | 10248 | #ifdef CONFIG_SPARC64 |
10252 | err = of_register_driver(&niu_of_driver, &of_bus_type); | 10249 | err = of_register_platform_driver(&niu_of_driver); |
10253 | #endif | 10250 | #endif |
10254 | 10251 | ||
10255 | if (!err) { | 10252 | if (!err) { |
10256 | err = pci_register_driver(&niu_pci_driver); | 10253 | err = pci_register_driver(&niu_pci_driver); |
10257 | #ifdef CONFIG_SPARC64 | 10254 | #ifdef CONFIG_SPARC64 |
10258 | if (err) | 10255 | if (err) |
10259 | of_unregister_driver(&niu_of_driver); | 10256 | of_unregister_platform_driver(&niu_of_driver); |
10260 | #endif | 10257 | #endif |
10261 | } | 10258 | } |
10262 | 10259 | ||
@@ -10267,7 +10264,7 @@ static void __exit niu_exit(void) | |||
10267 | { | 10264 | { |
10268 | pci_unregister_driver(&niu_pci_driver); | 10265 | pci_unregister_driver(&niu_pci_driver); |
10269 | #ifdef CONFIG_SPARC64 | 10266 | #ifdef CONFIG_SPARC64 |
10270 | of_unregister_driver(&niu_of_driver); | 10267 | of_unregister_platform_driver(&niu_of_driver); |
10271 | #endif | 10268 | #endif |
10272 | } | 10269 | } |
10273 | 10270 | ||