diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
commit | 85c24cd8d3676cbae9e8809e894e68025c6d497e (patch) | |
tree | 024c4b655c1a8e6943ed8e75b64be38980508cfe /include/linux/pl320-ipc.h | |
parent | 49d776ffb50f2e428aafb6a6576e58e80f1e886c (diff) | |
parent | d1d0b6b668818571122d30d68a0b3f768bd83a52 (diff) |
Merge branch 'for-linus' into for-next
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).
Conflicts:
sound/firewire/bebob/bebob_focusrite.c
Diffstat (limited to 'include/linux/pl320-ipc.h')
-rw-r--r-- | include/linux/pl320-ipc.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/pl320-ipc.h b/include/linux/pl320-ipc.h new file mode 100644 index 00000000000..5161f63ec1c --- /dev/null +++ b/include/linux/pl320-ipc.h @@ -0,0 +1,17 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see <http://www.gnu.org/licenses/>. + */ + +int pl320_ipc_transmit(u32 *data); +int pl320_ipc_register_notifier(struct notifier_block *nb); +int pl320_ipc_unregister_notifier(struct notifier_block *nb); |