diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /drivers/pnp/isapnp | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/isapnp')
| -rw-r--r-- | drivers/pnp/isapnp/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index bd213ffbcd9e..e851160e14f0 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c | |||
| @@ -1012,7 +1012,7 @@ static int __init isapnp_init(void) | |||
| 1012 | printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); | 1012 | printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n"); |
| 1013 | return 0; | 1013 | return 0; |
| 1014 | } | 1014 | } |
| 1015 | #ifdef CONFIG_PPC_MERGE | 1015 | #ifdef CONFIG_PPC |
| 1016 | if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP)) | 1016 | if (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP)) |
| 1017 | return -EINVAL; | 1017 | return -EINVAL; |
| 1018 | #endif | 1018 | #endif |