diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-22 11:39:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-22 11:39:19 +0100 |
| commit | a2d006f5290cc8bd447c79dba391f1691e6ebe72 (patch) | |
| tree | 07b8dca88a161a119384d0d79bdfbfd3d50f77ef /include/linux/platform_data | |
| parent | ce4c0ebf5370bc03b1f8fe5fe917fe322073ffbb (diff) | |
| parent | 9b3b269829faa3a6264588cff6ef28da0ca5cee5 (diff) | |
| download | linux-next-a2d006f5290cc8bd447c79dba391f1691e6ebe72.tar.gz linux-next-a2d006f5290cc8bd447c79dba391f1691e6ebe72.zip | |
Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
# Conflicts:
# net/netfilter/nf_conntrack_netlink.c
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/microchip-ksz.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/microchip-ksz.h b/include/linux/platform_data/microchip-ksz.h index 028781ad4059..411d5e164383 100644 --- a/include/linux/platform_data/microchip-ksz.h +++ b/include/linux/platform_data/microchip-ksz.h @@ -31,9 +31,11 @@ enum ksz_chip_id { KSZ88X3_CHIP_ID = 0x8830, KSZ8864_CHIP_ID = 0x8864, KSZ8895_CHIP_ID = 0x8895, + KSZ8995XA_CHIP_ID = 0x8995, KSZ9477_CHIP_ID = 0x00947700, KSZ9896_CHIP_ID = 0x00989600, KSZ9897_CHIP_ID = 0x00989700, + KSZ9897S_CHIP_ID = 0x00989701, KSZ9893_CHIP_ID = 0x00989300, KSZ9563_CHIP_ID = 0x00956300, KSZ8567_CHIP_ID = 0x00856700, |