diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/char/ipmi/ipmi_si_intf.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/char/ipmi/ipmi_si_intf.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 679cd08b80b4..176f1751237f 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
| @@ -3204,7 +3204,7 @@ static __devinit int init_ipmi_si(void) | |||
| 3204 | #ifdef CONFIG_ACPI | 3204 | #ifdef CONFIG_ACPI |
| 3205 | spmi_find_bmc(); | 3205 | spmi_find_bmc(); |
| 3206 | #endif | 3206 | #endif |
| 3207 | #ifdef CONFIG_PNP | 3207 | #ifdef CONFIG_ACPI |
| 3208 | pnp_register_driver(&ipmi_pnp_driver); | 3208 | pnp_register_driver(&ipmi_pnp_driver); |
| 3209 | #endif | 3209 | #endif |
| 3210 | 3210 | ||
| @@ -3330,7 +3330,7 @@ static __exit void cleanup_ipmi_si(void) | |||
| 3330 | #ifdef CONFIG_PCI | 3330 | #ifdef CONFIG_PCI |
| 3331 | pci_unregister_driver(&ipmi_pci_driver); | 3331 | pci_unregister_driver(&ipmi_pci_driver); |
| 3332 | #endif | 3332 | #endif |
| 3333 | #ifdef CONFIG_PNP | 3333 | #ifdef CONFIG_ACPI |
| 3334 | pnp_unregister_driver(&ipmi_pnp_driver); | 3334 | pnp_unregister_driver(&ipmi_pnp_driver); |
| 3335 | #endif | 3335 | #endif |
| 3336 | 3336 | ||