diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /arch/x86/include/asm/acpi.h | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'arch/x86/include/asm/acpi.h')
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 8d676d8ecde9..9830681446ad 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h | |||
| @@ -113,7 +113,6 @@ static inline void acpi_disable_pci(void) | |||
| 113 | acpi_pci_disabled = 1; | 113 | acpi_pci_disabled = 1; |
| 114 | acpi_noirq_set(); | 114 | acpi_noirq_set(); |
| 115 | } | 115 | } |
| 116 | extern int acpi_irq_balance_set(char *str); | ||
| 117 | 116 | ||
| 118 | /* routines for saving/restoring kernel state */ | 117 | /* routines for saving/restoring kernel state */ |
| 119 | extern int acpi_save_state_mem(void); | 118 | extern int acpi_save_state_mem(void); |