diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 18:27:25 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-12-19 18:27:25 +0300 |
| commit | 30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c (patch) | |
| tree | 418c535ebc1a0001b7c448e1d7ff97cf79bff8fd /arch/powerpc/include/asm/ps3.h | |
| parent | 66dfc517e8ec530b1d8d4776c05e3f264f38ecb8 (diff) | |
| parent | aeba12b26c79fc35e07e511f692a8907037d95da (diff) | |
| download | linux-30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/powerpc/include/asm/ps3.h')
| -rw-r--r-- | arch/powerpc/include/asm/ps3.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h index 8a0d8fb35328..d503dbd7856c 100644 --- a/arch/powerpc/include/asm/ps3.h +++ b/arch/powerpc/include/asm/ps3.h @@ -425,10 +425,6 @@ static inline void *ps3_system_bus_get_drvdata( return dev_get_drvdata(&dev->core); } -/* These two need global scope for get_arch_dma_ops(). */ - -extern struct bus_type ps3_system_bus_type; - /* system manager */ struct ps3_sys_manager_ops { |