Applied.
thanks,
-Len
On Tuesday 19 December 2006 15:56, akpm@xxxxxxxx wrote:
> From: Adrian Bunk <bunk@xxxxxxxxx>
>
> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
> Cc: "Brown, Len" <len.brown@xxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
> ---
>
> drivers/acpi/bus.c | 2 +-
> drivers/acpi/dock.c | 4 ++--
> drivers/acpi/pci_bind.c | 4 ++--
> include/acpi/acpi_bus.h | 2 --
> include/acpi/acpi_drivers.h | 2 --
> 5 files changed, 5 insertions(+), 9 deletions(-)
>
> diff -puN drivers/acpi/bus.c~acpi-make-code-static drivers/acpi/bus.c
> --- a/drivers/acpi/bus.c~acpi-make-code-static
> +++ a/drivers/acpi/bus.c
> @@ -728,7 +728,7 @@ static int __init acpi_bus_init(void)
> return -ENODEV;
> }
>
> -decl_subsys(acpi, NULL, NULL);
> +static decl_subsys(acpi, NULL, NULL);
>
> static int __init acpi_init(void)
> {
> diff -puN drivers/acpi/dock.c~acpi-make-code-static drivers/acpi/dock.c
> --- a/drivers/acpi/dock.c~acpi-make-code-static
> +++ a/drivers/acpi/dock.c
> @@ -641,7 +641,7 @@ static ssize_t show_docked(struct device
> return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
>
> }
> -DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
> +static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
>
> /*
> * write_undock - write method for "undock" file in sysfs
> @@ -657,7 +657,7 @@ static ssize_t write_undock(struct devic
> ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
> return ret ? ret: count;
> }
> -DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
> +static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
>
> /**
> * dock_add - add a new dock station
> diff -puN drivers/acpi/pci_bind.c~acpi-make-code-static drivers/acpi/pci_bind.c
> --- a/drivers/acpi/pci_bind.c~acpi-make-code-static
> +++ a/drivers/acpi/pci_bind.c
> @@ -106,7 +106,7 @@ acpi_status acpi_get_pci_id(acpi_handle
>
> EXPORT_SYMBOL(acpi_get_pci_id);
>
> -int acpi_pci_bind(struct acpi_device *device)
> +static int acpi_pci_bind(struct acpi_device *device)
> {
> int result = 0;
> acpi_status status = AE_OK;
> @@ -267,7 +267,7 @@ int acpi_pci_bind(struct acpi_device *de
> return result;
> }
>
> -int acpi_pci_unbind(struct acpi_device *device)
> +static int acpi_pci_unbind(struct acpi_device *device)
> {
> int result = 0;
> acpi_status status = AE_OK;
> diff -puN include/acpi/acpi_bus.h~acpi-make-code-static include/acpi/acpi_bus.h
> --- a/include/acpi/acpi_bus.h~acpi-make-code-static
> +++ a/include/acpi/acpi_bus.h
> @@ -315,8 +315,6 @@ struct acpi_bus_event {
> u32 data;
> };
>
> -extern struct subsystem acpi_subsys;
> -
> /*
> * External Functions
> */
> diff -puN include/acpi/acpi_drivers.h~acpi-make-code-static include/acpi/acpi_drivers.h
> --- a/include/acpi/acpi_drivers.h~acpi-make-code-static
> +++ a/include/acpi/acpi_drivers.h
> @@ -66,8 +66,6 @@ void acpi_pci_irq_del_prt(int segment, i
> struct pci_bus;
>
> acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
> -int acpi_pci_bind(struct acpi_device *device);
> -int acpi_pci_unbind(struct acpi_device *device);
> int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
> struct pci_bus *bus);
>
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
