diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-07-13 10:45:00 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 10:45:00 +0200 | 
| commit | 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 (patch) | |
| tree | 728174d72943cc9b981a5843553551df62eddc41 /drivers/acpi/namespace/nsdumpdv.c | |
| parent | a98a5d04f400ad112e59cadd739dbabf89417e60 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge with rsync://fileserver/linux
Diffstat (limited to 'drivers/acpi/namespace/nsdumpdv.c')
| -rw-r--r-- | drivers/acpi/namespace/nsdumpdv.c | 18 | 
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c index d30a59e6b07d..27c4f7cd2a43 100644 --- a/drivers/acpi/namespace/nsdumpdv.c +++ b/drivers/acpi/namespace/nsdumpdv.c @@ -43,15 +43,18 @@  #include <acpi/acpi.h> -#include <acpi/acnamesp.h> +/* TBD: This entire module is apparently obsolete and should be removed */ +  #define _COMPONENT          ACPI_NAMESPACE  	 ACPI_MODULE_NAME    ("nsdumpdv") - +#ifdef ACPI_OBSOLETE_FUNCTIONS  #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) +#include <acpi/acnamesp.h> +  /*******************************************************************************   *   * FUNCTION:    acpi_ns_dump_one_device @@ -59,13 +62,16 @@   * PARAMETERS:  Handle              - Node to be dumped   *              Level               - Nesting level of the handle   *              Context             - Passed into walk_namespace + *              return_value        - Not used + * + * RETURN:      Status   *   * DESCRIPTION: Dump a single Node that represents a device   *              This procedure is a user_function called by acpi_ns_walk_namespace.   *   ******************************************************************************/ -acpi_status +static acpi_status  acpi_ns_dump_one_device (  	acpi_handle                     obj_handle,  	u32                             level, @@ -108,12 +114,15 @@ acpi_ns_dump_one_device (   *   * PARAMETERS:  None   * + * RETURN:      None + *   * DESCRIPTION: Dump all objects of type "device"   *   ******************************************************************************/  void -acpi_ns_dump_root_devices (void) +acpi_ns_dump_root_devices ( +	void)  {  	acpi_handle                     sys_bus_handle;  	acpi_status                     status; @@ -142,5 +151,6 @@ acpi_ns_dump_root_devices (void)  }  #endif +#endif  | 
