mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branches 'acpi-pnp' and 'pnp'
* acpi-pnp: ACPI / PNP: constify device IDs * pnp: PNP: respect PNP_DRIVER_RES_DO_NOT_CHANGE when detaching PNP: Add Broadwell to Intel MCH size workaround
This commit is contained in:
commit
4c170ed1d9
3 changed files with 7 additions and 2 deletions
|
|
@ -367,7 +367,7 @@ static struct acpi_scan_handler acpi_pnp_handler = {
|
|||
*/
|
||||
static int is_cmos_rtc_device(struct acpi_device *adev)
|
||||
{
|
||||
struct acpi_device_id ids[] = {
|
||||
static const struct acpi_device_id ids[] = {
|
||||
{ "PNP0B00" },
|
||||
{ "PNP0B01" },
|
||||
{ "PNP0B02" },
|
||||
|
|
|
|||
Loading…
Reference in a new issue