diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-08-30 18:16:33 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-10-31 19:32:03 -0400 |
commit | 2d1a8a48ac68a835c42d8a31a02b8158cd599615 (patch) | |
tree | 0e8448f037c42e326493c759aafa0dce63ee4d2d /drivers/gpu/drm | |
parent | 44a8e3772f53a5337e74700fc166a3d4c3ef59a2 (diff) |
gpu: Add export.h as required to drivers/gpu files.
They need this to get all the EXPORT_SYMBOL variants and THIS_MODULE
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/gpu/drm')
30 files changed, 33 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index 1c3649242208..9afe495c12c7 100644 --- a/drivers/gpu/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c | |||
@@ -31,6 +31,7 @@ | |||
31 | * DEALINGS IN THE SOFTWARE. | 31 | * DEALINGS IN THE SOFTWARE. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <linux/export.h> | ||
34 | #include "drmP.h" | 35 | #include "drmP.h" |
35 | 36 | ||
36 | # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ | 37 | # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ |
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c index 529a0dbe9fc6..08ccefedb327 100644 --- a/drivers/gpu/drm/drm_buffer.c +++ b/drivers/gpu/drm/drm_buffer.c | |||
@@ -32,6 +32,7 @@ | |||
32 | * Pauli Nieminen <suokkos-at-gmail-dot-com> | 32 | * Pauli Nieminen <suokkos-at-gmail-dot-com> |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <linux/export.h> | ||
35 | #include "drm_buffer.h" | 36 | #include "drm_buffer.h" |
36 | 37 | ||
37 | /** | 38 | /** |
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 61e1ef90d4e5..30372f7b2d45 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | #include <linux/log2.h> | 38 | #include <linux/log2.h> |
39 | #include <linux/export.h> | ||
39 | #include <asm/shmparam.h> | 40 | #include <asm/shmparam.h> |
40 | #include "drmP.h" | 41 | #include "drmP.h" |
41 | 42 | ||
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c index 0e3bd5b54b78..592865381c6e 100644 --- a/drivers/gpu/drm/drm_cache.c +++ b/drivers/gpu/drm/drm_cache.c | |||
@@ -28,6 +28,7 @@ | |||
28 | * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 28 | * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/export.h> | ||
31 | #include "drmP.h" | 32 | #include "drmP.h" |
32 | 33 | ||
33 | #if defined(CONFIG_X86) | 34 | #if defined(CONFIG_X86) |
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index fe738f05309b..711d9653abd0 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -31,6 +31,7 @@ | |||
31 | */ | 31 | */ |
32 | #include <linux/list.h> | 32 | #include <linux/list.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <linux/export.h> | ||
34 | #include "drm.h" | 35 | #include "drm.h" |
35 | #include "drmP.h" | 36 | #include "drmP.h" |
36 | #include "drm_crtc.h" | 37 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index f2366440b738..c078c753fb40 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
@@ -29,6 +29,8 @@ | |||
29 | * Jesse Barnes <jesse.barnes@intel.com> | 29 | * Jesse Barnes <jesse.barnes@intel.com> |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <linux/export.h> | ||
33 | |||
32 | #include "drmP.h" | 34 | #include "drmP.h" |
33 | #include "drm_crtc.h" | 35 | #include "drm_crtc.h" |
34 | #include "drm_crtc_helper.h" | 36 | #include "drm_crtc_helper.h" |
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index b9dc2629ea9a..d067c12ba940 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/debugfs.h> | 33 | #include <linux/debugfs.h> |
34 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
36 | #include <linux/export.h> | ||
36 | #include "drmP.h" | 37 | #include "drmP.h" |
37 | 38 | ||
38 | #if defined(CONFIG_DEBUG_FS) | 39 | #if defined(CONFIG_DEBUG_FS) |
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index 252cbd74df0e..cfb4e333ec0f 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c | |||
@@ -33,6 +33,7 @@ | |||
33 | * OTHER DEALINGS IN THE SOFTWARE. | 33 | * OTHER DEALINGS IN THE SOFTWARE. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/export.h> | ||
36 | #include "drmP.h" | 37 | #include "drmP.h" |
37 | 38 | ||
38 | /** | 39 | /** |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 7a87e0878f30..fc81af9dbf42 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
@@ -48,6 +48,7 @@ | |||
48 | 48 | ||
49 | #include <linux/debugfs.h> | 49 | #include <linux/debugfs.h> |
50 | #include <linux/slab.h> | 50 | #include <linux/slab.h> |
51 | #include <linux/export.h> | ||
51 | #include "drmP.h" | 52 | #include "drmP.h" |
52 | #include "drm_core.h" | 53 | #include "drm_core.h" |
53 | 54 | ||
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index fe39c3570538..3e927ce7557d 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
33 | #include <linux/export.h> | ||
33 | #include "drmP.h" | 34 | #include "drmP.h" |
34 | #include "drm_edid.h" | 35 | #include "drm_edid.h" |
35 | #include "drm_edid_modes.h" | 36 | #include "drm_edid_modes.h" |
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index e3a75688f3cd..68dc8744b630 100644 --- a/drivers/gpu/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "drm_hashtab.h" | 36 | #include "drm_hashtab.h" |
37 | #include <linux/hash.h> | 37 | #include <linux/hash.h> |
38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
39 | #include <linux/export.h> | ||
39 | 40 | ||
40 | int drm_ht_create(struct drm_open_hash *ht, unsigned int order) | 41 | int drm_ht_create(struct drm_open_hash *ht, unsigned int order) |
41 | { | 42 | { |
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 4a058c7af6c0..ddd70db45f76 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c | |||
@@ -29,6 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | #include <linux/compat.h> | 30 | #include <linux/compat.h> |
31 | #include <linux/ratelimit.h> | 31 | #include <linux/ratelimit.h> |
32 | #include <linux/export.h> | ||
32 | 33 | ||
33 | #include "drmP.h" | 34 | #include "drmP.h" |
34 | #include "drm_core.h" | 35 | #include "drm_core.h" |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 3830e9e478c0..cb3794a00f98 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
41 | 41 | ||
42 | #include <linux/vgaarb.h> | 42 | #include <linux/vgaarb.h> |
43 | #include <linux/export.h> | ||
43 | 44 | ||
44 | /* Access macro for slots in vblank timestamp ringbuffer. */ | 45 | /* Access macro for slots in vblank timestamp ringbuffer. */ |
45 | #define vblanktimestamp(dev, crtc, count) ( \ | 46 | #define vblanktimestamp(dev, crtc, count) ( \ |
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c index c9b805000a11..c8b6b66d428d 100644 --- a/drivers/gpu/drm/drm_memory.c +++ b/drivers/gpu/drm/drm_memory.c | |||
@@ -34,6 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/highmem.h> | 36 | #include <linux/highmem.h> |
37 | #include <linux/export.h> | ||
37 | #include "drmP.h" | 38 | #include "drmP.h" |
38 | 39 | ||
39 | /** | 40 | /** |
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index 959186cbf328..961fb54f4266 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include "drm_mm.h" | 45 | #include "drm_mm.h" |
46 | #include <linux/slab.h> | 46 | #include <linux/slab.h> |
47 | #include <linux/seq_file.h> | 47 | #include <linux/seq_file.h> |
48 | #include <linux/export.h> | ||
48 | 49 | ||
49 | #define MM_UNUSED_TARGET 4 | 50 | #define MM_UNUSED_TARGET 4 |
50 | 51 | ||
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index ad74fb4dc542..fb8e46b4e8bc 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | #include <linux/list.h> | 33 | #include <linux/list.h> |
34 | #include <linux/list_sort.h> | 34 | #include <linux/list_sort.h> |
35 | #include <linux/export.h> | ||
35 | #include "drmP.h" | 36 | #include "drmP.h" |
36 | #include "drm.h" | 37 | #include "drm.h" |
37 | #include "drm_crtc.h" | 38 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index b6a19cb07caf..d4d10b7880cf 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
41 | #include <linux/dma-mapping.h> | 41 | #include <linux/dma-mapping.h> |
42 | #include <linux/export.h> | ||
42 | #include "drmP.h" | 43 | #include "drmP.h" |
43 | 44 | ||
44 | /**********************************************************************/ | 45 | /**********************************************************************/ |
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c index 2a8b6265ad3d..ae9db5e2b27c 100644 --- a/drivers/gpu/drm/drm_platform.c +++ b/drivers/gpu/drm/drm_platform.c | |||
@@ -25,6 +25,7 @@ | |||
25 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 25 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/export.h> | ||
28 | #include "drmP.h" | 29 | #include "drmP.h" |
29 | 30 | ||
30 | /** | 31 | /** |
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c index 0f3c4e3cafc3..fff87221f9e9 100644 --- a/drivers/gpu/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c | |||
@@ -39,6 +39,7 @@ | |||
39 | 39 | ||
40 | #include <linux/seq_file.h> | 40 | #include <linux/seq_file.h> |
41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
42 | #include <linux/export.h> | ||
42 | #include "drmP.h" | 43 | #include "drmP.h" |
43 | 44 | ||
44 | /*************************************************** | 45 | /*************************************************** |
diff --git a/drivers/gpu/drm/drm_sman.c b/drivers/gpu/drm/drm_sman.c index 34664587a74e..cebce45f4429 100644 --- a/drivers/gpu/drm/drm_sman.c +++ b/drivers/gpu/drm/drm_sman.c | |||
@@ -36,6 +36,7 @@ | |||
36 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 36 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include <linux/export.h> | ||
39 | #include "drm_sman.h" | 40 | #include "drm_sman.h" |
40 | 41 | ||
41 | struct drm_owner_item { | 42 | struct drm_owner_item { |
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 2eee8e016b38..0f9ef9bf6730 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/kdev_t.h> | 16 | #include <linux/kdev_t.h> |
17 | #include <linux/gfp.h> | 17 | #include <linux/gfp.h> |
18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
19 | #include <linux/export.h> | ||
19 | 20 | ||
20 | #include "drm_sysfs.h" | 21 | #include "drm_sysfs.h" |
21 | #include "drm_core.h" | 22 | #include "drm_core.h" |
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c index 206d2300d873..445003f4dc93 100644 --- a/drivers/gpu/drm/drm_usb.c +++ b/drivers/gpu/drm/drm_usb.c | |||
@@ -1,5 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include "drmP.h" |
2 | #include <linux/usb.h> | 2 | #include <linux/usb.h> |
3 | #include <linux/export.h> | ||
3 | 4 | ||
4 | #ifdef CONFIG_USB | 5 | #ifdef CONFIG_USB |
5 | int drm_get_usb_dev(struct usb_interface *interface, | 6 | int drm_get_usb_dev(struct usb_interface *interface, |
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 5db96d45fc71..8c03eaf41448 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c | |||
@@ -34,6 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "drmP.h" | 36 | #include "drmP.h" |
37 | #include <linux/export.h> | ||
37 | #if defined(__ia64__) | 38 | #if defined(__ia64__) |
38 | #include <linux/efi.h> | 39 | #include <linux/efi.h> |
39 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 8e95d66800b0..d14b44e13f51 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
30 | #include <linux/debugfs.h> | 30 | #include <linux/debugfs.h> |
31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
32 | #include <linux/export.h> | ||
32 | #include "drmP.h" | 33 | #include "drmP.h" |
33 | #include "drm.h" | 34 | #include "drm.h" |
34 | #include "intel_drv.h" | 35 | #include "intel_drv.h" |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index fc1a0832af4f..09b318b0227f 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/export.h> | ||
30 | #include "drmP.h" | 31 | #include "drmP.h" |
31 | #include "drm.h" | 32 | #include "drm.h" |
32 | #include "drm_crtc.h" | 33 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 9ed5380e5a53..d30ccccb9d73 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c | |||
@@ -28,6 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/i2c-algo-bit.h> | 30 | #include <linux/i2c-algo-bit.h> |
31 | #include <linux/export.h> | ||
31 | #include "drmP.h" | 32 | #include "drmP.h" |
32 | #include "drm.h" | 33 | #include "drm.h" |
33 | #include "intel_drv.h" | 34 | #include "intel_drv.h" |
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 6db3b1ccb6eb..3003fb25aefd 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/export.h> | ||
31 | #include "drmP.h" | 32 | #include "drmP.h" |
32 | #include "drm.h" | 33 | #include "drm.h" |
33 | #include "drm_crtc.h" | 34 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c index 02cb7da4124d..e6d110ce2331 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c | |||
@@ -23,6 +23,8 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include <linux/export.h> | ||
27 | |||
26 | #include "drmP.h" | 28 | #include "drmP.h" |
27 | #include "radeon_drm.h" | 29 | #include "radeon_drm.h" |
28 | #include "radeon.h" | 30 | #include "radeon.h" |
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 58c271ebc0f7..f9cc548d6d98 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/file.h> | 35 | #include <linux/file.h> |
36 | #include <linux/swap.h> | 36 | #include <linux/swap.h> |
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | #include <linux/export.h> | ||
38 | #include "drm_cache.h" | 39 | #include "drm_cache.h" |
39 | #include "drm_mem_util.h" | 40 | #include "drm_mem_util.h" |
40 | #include "ttm/ttm_module.h" | 41 | #include "ttm/ttm_module.h" |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 070797b7b03a..34e51a1695b8 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |||
@@ -26,6 +26,8 @@ | |||
26 | * | 26 | * |
27 | **************************************************************************/ | 27 | **************************************************************************/ |
28 | 28 | ||
29 | #include <linux/export.h> | ||
30 | |||
29 | #include "drmP.h" | 31 | #include "drmP.h" |
30 | #include "vmwgfx_drv.h" | 32 | #include "vmwgfx_drv.h" |
31 | 33 | ||