diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2020-03-24 13:37:50 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2020-03-24 13:37:50 +0300 |
commit | e7c69fd3cc534440491c473ec630a085d000d18f (patch) | |
tree | 6b6228c10ad05f09edeaa4b81e3ce2279fc0cc03 /drivers/misc | |
parent | f7b87c9af45414225fc6e78af898e403b719181d (diff) | |
parent | 4837621cd61e6b81a182098889143c6c9a06b0f3 (diff) | |
download | linux-e7c69fd3cc534440491c473ec630a085d000d18f.tar.xz |
Merge tag 'at24-updates-for-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-5.7
at24 updates for v5.7
- add a new ACPI ID for 24c1024
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/eeprom/at24.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 031eb64549af..b84e6a3daed4 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -227,6 +227,7 @@ MODULE_DEVICE_TABLE(of, at24_of_match); static const struct acpi_device_id at24_acpi_ids[] = { { "INT3499", (kernel_ulong_t)&at24_data_INT3499 }, + { "TPF0001", (kernel_ulong_t)&at24_data_24c1024 }, { /* END OF LIST */ } }; MODULE_DEVICE_TABLE(acpi, at24_acpi_ids); |