diff options
35 files changed, 41 insertions, 127 deletions
diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c index 813ea35eddc..db106f35af3 100644 --- a/drivers/staging/tidspbridge/core/chnl_sm.c +++ b/drivers/staging/tidspbridge/core/chnl_sm.c @@ -42,11 +42,12 @@ * !LST_Empty(pchnl->pio_completions) ==> pchnl->sync_event is set. */ +#include <linux/types.h> + /* ----------------------------------- OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c index abaa5950fb9..6f9ea059974 100644 --- a/drivers/staging/tidspbridge/core/dsp-clock.c +++ b/drivers/staging/tidspbridge/core/dsp-clock.c @@ -16,13 +16,14 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> + /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> #include <plat/dmtimer.h> #include <plat/mcbsp.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> #include <dspbridge/cfg.h> #include <dspbridge/drv.h> diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c index 74835c5cb3a..31b623a909b 100644 --- a/drivers/staging/tidspbridge/core/io_sm.c +++ b/drivers/staging/tidspbridge/core/io_sm.c @@ -23,13 +23,13 @@ * which may cause timeouts and/or failure of the sync_wait_on_event * function. */ +#include <linux/types.h> /* Host OS */ #include <dspbridge/host_os.h> #include <linux/workqueue.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* Trace & Debug */ diff --git a/drivers/staging/tidspbridge/core/msg_sm.c b/drivers/staging/tidspbridge/core/msg_sm.c index 888d32d3c32..a86f0ce1c7a 100644 --- a/drivers/staging/tidspbridge/core/msg_sm.c +++ b/drivers/staging/tidspbridge/core/msg_sm.c @@ -15,9 +15,9 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index 71813f1fa0a..48f1d7ca924 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/drivers/staging/tidspbridge/core/tiomap3430.c @@ -16,6 +16,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> #include <linux/mm.h> @@ -23,7 +24,6 @@ #include <plat/control.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c index dd1afe7a9e7..2126f597753 100644 --- a/drivers/staging/tidspbridge/core/wdt.c +++ b/drivers/staging/tidspbridge/core/wdt.c @@ -15,8 +15,8 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> #include <dspbridge/dspdeh.h> #include <dspbridge/dev.h> diff --git a/drivers/staging/tidspbridge/gen/gb.c b/drivers/staging/tidspbridge/gen/gb.c index d007233aa2a..06eb3d36122 100644 --- a/drivers/staging/tidspbridge/gen/gb.c +++ b/drivers/staging/tidspbridge/gen/gb.c @@ -15,9 +15,9 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <linux/types.h> /* ----------------------------------- This */ #include <dspbridge/gs.h> diff --git a/drivers/staging/tidspbridge/gen/gh.c b/drivers/staging/tidspbridge/gen/gh.c index 44fad88e69c..f72d943c480 100644 --- a/drivers/staging/tidspbridge/gen/gh.c +++ b/drivers/staging/tidspbridge/gen/gh.c @@ -14,7 +14,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#include <dspbridge/std.h> +#include <linux/types.h> #include <dspbridge/host_os.h> diff --git a/drivers/staging/tidspbridge/gen/gs.c b/drivers/staging/tidspbridge/gen/gs.c index 3d091b9a6a3..9fc614439ba 100644 --- a/drivers/staging/tidspbridge/gen/gs.c +++ b/drivers/staging/tidspbridge/gen/gs.c @@ -16,8 +16,8 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> #include <linux/types.h> diff --git a/drivers/staging/tidspbridge/gen/uuidutil.c b/drivers/staging/tidspbridge/gen/uuidutil.c index 840da427faf..9a112b3ca8e 100644 --- a/drivers/staging/tidspbridge/gen/uuidutil.c +++ b/drivers/staging/tidspbridge/gen/uuidutil.c @@ -15,12 +15,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h index fb168e60a1c..a815b67923c 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h +++ b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h @@ -22,7 +22,6 @@ #include <linux/types.h> #include <dspbridge/dbtype.h> /* GPP side type definitions */ -#include <dspbridge/std.h> /* DSP/BIOS type definitions */ #include <dspbridge/rms_sh.h> /* Types shared between GPP and DSP */ #define PG_SIZE4K 4096 diff --git a/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h b/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h index 3c31f5e5564..83c0f1d9619 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h +++ b/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h @@ -19,10 +19,6 @@ #ifndef RMSTYPES_ #define RMSTYPES_ #include <linux/types.h> -/* - * DSP-side definitions. - */ -#include <dspbridge/std.h> typedef u32 rms_word; #endif /* RMSTYPES_ */ diff --git a/drivers/staging/tidspbridge/include/dspbridge/std.h b/drivers/staging/tidspbridge/include/dspbridge/std.h deleted file mode 100644 index ca2827d92e2..00000000000 --- a/drivers/staging/tidspbridge/include/dspbridge/std.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * std.h - * - * DSP-BIOS Bridge driver support functions for TI OMAP processors. - * - * Copyright (C) 2008 Texas Instruments, Inc. - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -#ifndef STD_ -#define STD_ - -#include <linux/types.h> - -/* - * ======== _TI_ ======== - * _TI_ is defined for all TI targets - */ -#if defined(_29_) || defined(_30_) || defined(_40_) || defined(_50_) || \ - defined(_54_) || defined(_55_) || defined(_6x_) || defined(_80_) || \ - defined(_28_) || defined(_24_) -#define _TI_ 1 -#endif - -/* - * ======== _FLOAT_ ======== - * _FLOAT_ is defined for all targets that natively support floating point - */ -#if defined(_SUN_) || defined(_30_) || defined(_40_) || defined(_67_) || \ - defined(_80_) -#define _FLOAT_ 1 -#endif - -/* - * ======== _FIXED_ ======== - * _FIXED_ is defined for all fixed point target architectures - */ -#if defined(_29_) || defined(_50_) || defined(_54_) || defined(_55_) || \ - defined(_62_) || defined(_64_) || defined(_28_) -#define _FIXED_ 1 -#endif - -/* - * ======== _TARGET_ ======== - * _TARGET_ is defined for all target architectures (as opposed to - * host-side software) - */ -#if defined(_FIXED_) || defined(_FLOAT_) -#define _TARGET_ 1 -#endif - -/* - * 8, 16, 32-bit type definitions - * - * Sm* - 8-bit type - * Md* - 16-bit type - * Lg* - 32-bit type - * - * *s32 - signed type - * *u32 - unsigned type - * *Bits - unsigned type (bit-maps) - */ - -/* - * Aliases for standard C types - */ - -typedef s32(*fxn) (void); /* generic function type */ - -/* - * These macros are used to cast 'Arg' types to 's32' or 'Ptr'. - * These macros were added for the 55x since Arg is not the same - * size as s32 and Ptr in 55x large model. - */ -#if defined(_28l_) || defined(_55l_) -#define ARG_TO_INT(A) ((s32)((long)(A) & 0xffff)) -#define ARG_TO_PTR(A) ((Ptr)(A)) -#else -#define ARG_TO_INT(A) ((s32)(A)) -#define ARG_TO_PTR(A) ((Ptr)(A)) -#endif - -#endif /* STD_ */ diff --git a/drivers/staging/tidspbridge/pmgr/chnl.c b/drivers/staging/tidspbridge/pmgr/chnl.c index 7da17c8e8b7..b7ec75121d7 100644 --- a/drivers/staging/tidspbridge/pmgr/chnl.c +++ b/drivers/staging/tidspbridge/pmgr/chnl.c @@ -17,11 +17,11 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c index 4861c51e16b..ca705da7ce1 100644 --- a/drivers/staging/tidspbridge/pmgr/cmm.c +++ b/drivers/staging/tidspbridge/pmgr/cmm.c @@ -29,9 +29,9 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c index 21aad312b54..f324130b640 100644 --- a/drivers/staging/tidspbridge/pmgr/cod.c +++ b/drivers/staging/tidspbridge/pmgr/cod.c @@ -20,13 +20,14 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> + /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> #include <linux/fs.h> #include <linux/uaccess.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c index 05601dc5527..e8da0300564 100644 --- a/drivers/staging/tidspbridge/pmgr/dbll.c +++ b/drivers/staging/tidspbridge/pmgr/dbll.c @@ -13,12 +13,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c index f1b69e10315..31ff15d0e1d 100644 --- a/drivers/staging/tidspbridge/pmgr/dev.c +++ b/drivers/staging/tidspbridge/pmgr/dev.c @@ -15,12 +15,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c index d45cd72640e..2d8c9e294e1 100644 --- a/drivers/staging/tidspbridge/pmgr/dmm.c +++ b/drivers/staging/tidspbridge/pmgr/dmm.c @@ -20,12 +20,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c index 7ff2bd07d6e..1170798cc4c 100644 --- a/drivers/staging/tidspbridge/pmgr/dspapi.c +++ b/drivers/staging/tidspbridge/pmgr/dspapi.c @@ -16,12 +16,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c index 6585050804b..96ff8ad223f 100644 --- a/drivers/staging/tidspbridge/pmgr/io.c +++ b/drivers/staging/tidspbridge/pmgr/io.c @@ -15,12 +15,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/pmgr/msg.c b/drivers/staging/tidspbridge/pmgr/msg.c index 3903c4147df..6d1fde946b7 100644 --- a/drivers/staging/tidspbridge/pmgr/msg.c +++ b/drivers/staging/tidspbridge/pmgr/msg.c @@ -15,12 +15,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c index 992ff734603..35870eab25f 100644 --- a/drivers/staging/tidspbridge/rmgr/dbdcd.c +++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c @@ -22,12 +22,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ #include <dspbridge/dbc.h> diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c index 13cfdfb4d9f..2aedf0d88c8 100644 --- a/drivers/staging/tidspbridge/rmgr/disp.c +++ b/drivers/staging/tidspbridge/rmgr/disp.c @@ -16,12 +16,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c index a6bbb240d86..3815622284c 100644 --- a/drivers/staging/tidspbridge/rmgr/drv.c +++ b/drivers/staging/tidspbridge/rmgr/drv.c @@ -15,12 +15,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c index dae16f83ffa..340c92d2473 100644 --- a/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -19,6 +19,7 @@ /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> +#include <linux/types.h> #include <linux/platform_device.h> #include <linux/pm.h> @@ -32,7 +33,6 @@ #include <linux/cdev.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/dspdrv.c b/drivers/staging/tidspbridge/rmgr/dspdrv.c index 8a282488e31..b50cdc595b0 100644 --- a/drivers/staging/tidspbridge/rmgr/dspdrv.c +++ b/drivers/staging/tidspbridge/rmgr/dspdrv.c @@ -17,10 +17,10 @@ */ /* ----------------------------------- Host OS */ +#include <linux/types.h> #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/mgr.c b/drivers/staging/tidspbridge/rmgr/mgr.c index 3f52660a109..54f8580b442 100644 --- a/drivers/staging/tidspbridge/rmgr/mgr.c +++ b/drivers/staging/tidspbridge/rmgr/mgr.c @@ -18,8 +18,9 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> + /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c index e96f5077a6e..1df1fc4b496 100644 --- a/drivers/staging/tidspbridge/rmgr/nldr.c +++ b/drivers/staging/tidspbridge/rmgr/nldr.c @@ -16,9 +16,10 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> + #include <dspbridge/host_os.h> -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> #include <dspbridge/dbc.h> diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index c931721c04c..d53d34021fd 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c @@ -16,11 +16,11 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c index 9ed42eb444f..79f0c9debf3 100644 --- a/drivers/staging/tidspbridge/rmgr/proc.c +++ b/drivers/staging/tidspbridge/rmgr/proc.c @@ -16,13 +16,13 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> /* ------------------------------------ Host OS */ #include <linux/dma-mapping.h> #include <linux/scatterlist.h> #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/rmm.c b/drivers/staging/tidspbridge/rmgr/rmm.c index 910132ff1d5..6db9ace0a86 100644 --- a/drivers/staging/tidspbridge/rmgr/rmm.c +++ b/drivers/staging/tidspbridge/rmgr/rmm.c @@ -37,8 +37,9 @@ * been allocated, and not yet freed. */ +#include <linux/types.h> + /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c index ad3b50cd32c..2a040034607 100644 --- a/drivers/staging/tidspbridge/rmgr/strm.c +++ b/drivers/staging/tidspbridge/rmgr/strm.c @@ -16,11 +16,12 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> + /* ----------------------------------- Host OS */ #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/services/cfg.c b/drivers/staging/tidspbridge/services/cfg.c index 86c8da4a0e0..f7e5e7f7f49 100644 --- a/drivers/staging/tidspbridge/services/cfg.c +++ b/drivers/staging/tidspbridge/services/cfg.c @@ -16,8 +16,9 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> + /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ diff --git a/drivers/staging/tidspbridge/services/services.c b/drivers/staging/tidspbridge/services/services.c index 23be95c374d..6a7dd6f3ecb 100644 --- a/drivers/staging/tidspbridge/services/services.c +++ b/drivers/staging/tidspbridge/services/services.c @@ -16,10 +16,11 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <linux/types.h> + #include <dspbridge/host_os.h> /* ----------------------------------- DSP/BIOS Bridge */ -#include <dspbridge/std.h> #include <dspbridge/dbdefs.h> /* ----------------------------------- Trace & Debug */ |