diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 23:00:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 23:00:36 +0100 |
| commit | 5438eb458830693c5f8481aa36097245a727e2c2 (patch) | |
| tree | ace854c43e06a39fcfebf8b68171423643cf7581 /Documentation | |
| parent | 9200c83233d5ca5e921deab98602277df9f99f9f (diff) | |
| parent | 5ad28496055858166eb2268344c8fda2c26d3561 (diff) | |
| download | linux-next-history-5438eb458830693c5f8481aa36097245a727e2c2.tar.gz | |
Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
# Conflicts:
# drivers/gpib/cb7210/cb7210.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/devices.txt | 1 | ||||
| -rw-r--r-- | Documentation/userspace-api/ioctl/ioctl-number.rst | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt index 440633642fea7..f544399675fa3 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -291,7 +291,6 @@ 154 = /dev/pmu Macintosh PowerBook power manager 155 = 156 = /dev/lcd Front panel LCD display - 157 = /dev/ac Applicom Intl Profibus card 158 = /dev/nwbutton Netwinder external button 159 = /dev/nwdebug Netwinder debug interface 160 = /dev/nwflash Netwinder flash memory diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index 6c8fdcf8db66a..3f0ef1e27eb07 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -340,7 +340,6 @@ Code Seq# Include File Comments 0xA2 all uapi/linux/acrn.h ACRN hypervisor 0xA3 80-8F Port ACL in development: <mailto:tlewis@mindspring.com> -0xA3 90-9F linux/dtlk.h 0xA4 00-1F uapi/linux/tee.h Generic TEE subsystem 0xA4 00-1F uapi/asm/sgx.h <mailto:linux-sgx@vger.kernel.org> 0xA5 01-05 linux/surface_aggregator/cdev.h Microsoft Surface Platform System Aggregator |