projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes'
[powerpc.git]
/
include
/
linux
/
acpi.h
diff --git
a/include/linux/acpi.h
b/include/linux/acpi.h
index
b46a520
..
026c3c0
100644
(file)
--- a/
include/linux/acpi.h
+++ b/
include/linux/acpi.h
@@
-41,7
+41,7
@@
#include <asm/acpi.h>
#include <asm/acpi.h>
-#ifdef CONFIG_ACPI
_BOOT
+#ifdef CONFIG_ACPI
enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0,
enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0,
@@
-429,23
+429,13
@@
extern int pci_mmcfg_config_num;
extern int sbf_port ;
extern int sbf_port ;
-#else /*
!CONFIG_ACPI_BOOT
*/
+#else /*
!CONFIG_ACPI
*/
#define acpi_mp_config 0
#define acpi_mp_config 0
-static inline int acpi_boot_init(void)
-{
- return 0;
-}
-
-static inline int acpi_boot_table_init(void)
-{
- return 0;
-}
+#endif /* !CONFIG_ACPI */
-#endif /*!CONFIG_ACPI_BOOT*/
-
-unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
+int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
/*
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
/*
@@
-455,7
+445,7
@@
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
*/
void acpi_unregister_gsi (u32 gsi);
*/
void acpi_unregister_gsi (u32 gsi);
-#ifdef CONFIG_ACPI
_PCI
+#ifdef CONFIG_ACPI
struct acpi_prt_entry {
struct list_head node;
struct acpi_prt_entry {
struct list_head node;
@@
-489,7
+479,7
@@
struct acpi_pci_driver {
int acpi_pci_register_driver(struct acpi_pci_driver *driver);
void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
int acpi_pci_register_driver(struct acpi_pci_driver *driver);
void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
-#endif /*
CONFIG_ACPI_PCI
*/
+#endif /*
CONFIG_ACPI
*/
#ifdef CONFIG_ACPI_EC
#ifdef CONFIG_ACPI_EC
@@
-498,20
+488,9
@@
extern int ec_write(u8 addr, u8 val);
#endif /*CONFIG_ACPI_EC*/
#endif /*CONFIG_ACPI_EC*/
-#ifdef CONFIG_ACPI_INTERPRETER
-
extern int acpi_blacklisted(void);
extern void acpi_bios_year(char *s);
extern int acpi_blacklisted(void);
extern void acpi_bios_year(char *s);
-#else /*!CONFIG_ACPI_INTERPRETER*/
-
-static inline int acpi_blacklisted(void)
-{
- return 0;
-}
-
-#endif /*!CONFIG_ACPI_INTERPRETER*/
-
#define ACPI_CSTATE_LIMIT_DEFINED /* for driver builds */
#ifdef CONFIG_ACPI
#define ACPI_CSTATE_LIMIT_DEFINED /* for driver builds */
#ifdef CONFIG_ACPI
@@
-549,5
+528,17
@@
static inline int acpi_get_pxm(acpi_handle handle)
extern int pnpacpi_disabled;
extern int pnpacpi_disabled;
+#else /* CONFIG_ACPI */
+
+static inline int acpi_boot_init(void)
+{
+ return 0;
+}
+
+static inline int acpi_boot_table_init(void)
+{
+ return 0;
+}
+
#endif /* CONFIG_ACPI */
#endif /*_LINUX_ACPI_H*/
#endif /* CONFIG_ACPI */
#endif /*_LINUX_ACPI_H*/