diff options
author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-03-26 12:08:35 +0000 |
---|---|---|
committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-03-26 12:08:35 +0000 |
commit | f843bc9bc952bdeb21586ee921d29f5c2ae5a863 (patch) | |
tree | 05daf639c7add0e0fcb94f65143f10d7d87bd0b5 /include/dt-bindings/ata/ahci.h | |
parent | 3c688a55831db128cc709396992886396d4f1654 (diff) | |
parent | 3d5a640ecf92e4c8d6e157849217b68984a819bc (diff) |
Merge branches 'sa1100-for-next' and 'unstable/sa11x0-asoc' into sa1100
Diffstat (limited to 'include/dt-bindings/ata/ahci.h')
-rw-r--r-- | include/dt-bindings/ata/ahci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/ata/ahci.h b/include/dt-bindings/ata/ahci.h index 77997b35612c..b3f3b7cf9af8 100644 --- a/include/dt-bindings/ata/ahci.h +++ b/include/dt-bindings/ata/ahci.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only or BSD-2-Clause */ +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ /* * This header provides constants for most AHCI bindings. */ |