diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-13 09:15:51 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-13 09:15:51 -0600 |
| commit | c8ffd1356d42223cbb8c86280a083cc3c93e6426 (patch) | |
| tree | 35be4e1f46e5b386c124483872c58611cd97fe6c /fs/btrfs | |
| parent | 2ee6f3a5f7550de3599faef9704e166e5dcace35 (diff) | |
| parent | 577373239a35afa865098741cf805f6176de8b16 (diff) | |
Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
Roger Quadros <rogerq@kernel.org> says:
Sync AM62 device tree files with Linux v6.9 and
add in the missing bits in -u-boot.dtsi to get CPSW
Ethernet working.
CI testing: https://github.com/u-boot/u-boot/pull/534
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/dev.c | 1 | ||||
| -rw-r--r-- | fs/btrfs/disk-io.c | 1 | ||||
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c index cb3b9713a5f..e27a032c9f6 100644 --- a/fs/btrfs/dev.c +++ b/fs/btrfs/dev.c @@ -5,7 +5,6 @@ * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ -#include <common.h> #include <blk.h> #include <compiler.h> #include <fs_internal.h> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 7eaa7e94960..e5bfaf461c2 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1,5 +1,4 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> #include <fs_internal.h> #include <log.h> #include <uuid.h> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 7d4095d9ca8..8ec545eded7 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ #include <stdlib.h> -#include <common.h> +#include <errno.h> #include <fs_internal.h> #include "ctree.h" #include "disk-io.h" |