mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Pull release into acpica branch
This commit is contained in:
commit
3d5271f988
6324 changed files with 408474 additions and 239611 deletions
|
|
@ -12,7 +12,7 @@
|
|||
#include "base.h"
|
||||
|
||||
LIST_HEAD(pnp_cards);
|
||||
LIST_HEAD(pnp_card_drivers);
|
||||
static LIST_HEAD(pnp_card_drivers);
|
||||
|
||||
|
||||
static const struct pnp_card_device_id * match_card(struct pnp_card_driver * drv, struct pnp_card * card)
|
||||
|
|
@ -374,11 +374,13 @@ void pnp_unregister_card_driver(struct pnp_card_driver * drv)
|
|||
pnp_unregister_driver(&drv->link);
|
||||
}
|
||||
|
||||
#if 0
|
||||
EXPORT_SYMBOL(pnp_add_card);
|
||||
EXPORT_SYMBOL(pnp_remove_card);
|
||||
EXPORT_SYMBOL(pnp_add_card_device);
|
||||
EXPORT_SYMBOL(pnp_remove_card_device);
|
||||
EXPORT_SYMBOL(pnp_add_card_id);
|
||||
#endif /* 0 */
|
||||
EXPORT_SYMBOL(pnp_request_card_device);
|
||||
EXPORT_SYMBOL(pnp_release_card_device);
|
||||
EXPORT_SYMBOL(pnp_register_card_driver);
|
||||
|
|
|
|||
|
|
@ -158,13 +158,14 @@ void __pnp_remove_device(struct pnp_dev *dev)
|
|||
*
|
||||
* this function will free all mem used by dev
|
||||
*/
|
||||
|
||||
#if 0
|
||||
void pnp_remove_device(struct pnp_dev *dev)
|
||||
{
|
||||
if (!dev || dev->card)
|
||||
return;
|
||||
__pnp_remove_device(dev);
|
||||
}
|
||||
#endif /* 0 */
|
||||
|
||||
static int __init pnp_init(void)
|
||||
{
|
||||
|
|
@ -174,7 +175,9 @@ static int __init pnp_init(void)
|
|||
|
||||
subsys_initcall(pnp_init);
|
||||
|
||||
#if 0
|
||||
EXPORT_SYMBOL(pnp_register_protocol);
|
||||
EXPORT_SYMBOL(pnp_unregister_protocol);
|
||||
EXPORT_SYMBOL(pnp_add_device);
|
||||
EXPORT_SYMBOL(pnp_remove_device);
|
||||
#endif /* 0 */
|
||||
|
|
|
|||
|
|
@ -214,6 +214,8 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
|
|||
|
||||
EXPORT_SYMBOL(pnp_register_driver);
|
||||
EXPORT_SYMBOL(pnp_unregister_driver);
|
||||
#if 0
|
||||
EXPORT_SYMBOL(pnp_add_id);
|
||||
#endif
|
||||
EXPORT_SYMBOL(pnp_device_attach);
|
||||
EXPORT_SYMBOL(pnp_device_detach);
|
||||
|
|
|
|||
|
|
@ -941,7 +941,9 @@ EXPORT_SYMBOL(isapnp_protocol);
|
|||
EXPORT_SYMBOL(isapnp_present);
|
||||
EXPORT_SYMBOL(isapnp_cfg_begin);
|
||||
EXPORT_SYMBOL(isapnp_cfg_end);
|
||||
#if 0
|
||||
EXPORT_SYMBOL(isapnp_read_byte);
|
||||
#endif
|
||||
EXPORT_SYMBOL(isapnp_write_byte);
|
||||
|
||||
static int isapnp_read_resources(struct pnp_dev *dev, struct pnp_resource_table *res)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/pnp.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/bitmap.h>
|
||||
#include "base.h"
|
||||
|
||||
DECLARE_MUTEX(pnp_res_mutex);
|
||||
|
|
@ -553,7 +555,9 @@ void pnp_resource_change(struct resource *resource, unsigned long start, unsigne
|
|||
|
||||
|
||||
EXPORT_SYMBOL(pnp_manual_config_dev);
|
||||
#if 0
|
||||
EXPORT_SYMBOL(pnp_auto_config_dev);
|
||||
#endif
|
||||
EXPORT_SYMBOL(pnp_activate_dev);
|
||||
EXPORT_SYMBOL(pnp_disable_dev);
|
||||
EXPORT_SYMBOL(pnp_resource_change);
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
|
|||
return ACPI_FAILURE(status) ? -ENODEV : 0;
|
||||
}
|
||||
|
||||
struct pnp_protocol pnpacpi_protocol = {
|
||||
static struct pnp_protocol pnpacpi_protocol = {
|
||||
.name = "Plug and Play ACPI",
|
||||
.get = pnpacpi_get_resources,
|
||||
.set = pnpacpi_set_resources,
|
||||
|
|
@ -234,7 +234,7 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle,
|
|||
}
|
||||
|
||||
int pnpacpi_disabled __initdata;
|
||||
int __init pnpacpi_init(void)
|
||||
static int __init pnpacpi_init(void)
|
||||
{
|
||||
if (acpi_disabled || pnpacpi_disabled) {
|
||||
pnp_info("PnP ACPI: disabled");
|
||||
|
|
@ -258,4 +258,6 @@ static int __init pnpacpi_setup(char *str)
|
|||
}
|
||||
__setup("pnpacpi=", pnpacpi_setup);
|
||||
|
||||
#if 0
|
||||
EXPORT_SYMBOL(pnpacpi_protocol);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
#include <linux/ctype.h>
|
||||
#include <linux/pnp.h>
|
||||
#include <linux/pnpbios.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
#include <linux/pci.h>
|
||||
|
|
|
|||
|
|
@ -477,12 +477,14 @@ int pnp_check_dma(struct pnp_dev * dev, int idx)
|
|||
}
|
||||
|
||||
|
||||
#if 0
|
||||
EXPORT_SYMBOL(pnp_register_dependent_option);
|
||||
EXPORT_SYMBOL(pnp_register_independent_option);
|
||||
EXPORT_SYMBOL(pnp_register_irq_resource);
|
||||
EXPORT_SYMBOL(pnp_register_dma_resource);
|
||||
EXPORT_SYMBOL(pnp_register_port_resource);
|
||||
EXPORT_SYMBOL(pnp_register_mem_resource);
|
||||
#endif /* 0 */
|
||||
|
||||
|
||||
/* format is: pnp_reserve_irq=irq1[,irq2] .... */
|
||||
|
|
|
|||
Loading…
Reference in a new issue