diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 23:43:35 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 23:43:35 +0400 |
commit | 0b40b4b44378f18b3c76384fa1380c24b5cd0f52 (patch) | |
tree | 35aada569a65dba9c28423401fdb428bc1c7ec9a /arch/arm/mach-bcmring/include/csp/module.h | |
parent | 4369c5f3ae82009aa45115884208aada5a8c9273 (diff) | |
parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (diff) | |
download | linux-0b40b4b44378f18b3c76384fa1380c24b5cd0f52.tar.xz |
Merge branch 'bcmring/removal' into next/cleanup2
From "Christian Daudt" <csd@broadcom.com>:
Remove mach-bcmring as this is no longer maintained or used.
Updated the removal with:
- drop the edit to mach-types requested by Russell King
- eliminate defconfig mod from patch 1 requested Olof Johansson
Also switched to using git send-email to avoid word-wrapping
problems
* bcmring/removal:
ARM: Remove mach-bcmring
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-bcmring/include/csp/module.h')
-rw-r--r-- | arch/arm/mach-bcmring/include/csp/module.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm/mach-bcmring/include/csp/module.h b/arch/arm/mach-bcmring/include/csp/module.h deleted file mode 100644 index c30d2a5975a6..000000000000 --- a/arch/arm/mach-bcmring/include/csp/module.h +++ /dev/null @@ -1,32 +0,0 @@ -/***************************************************************************** -* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved. -* -* Unless you and Broadcom execute a separate written software license -* agreement governing use of this software, this software is licensed to you -* under the terms of the GNU General Public License version 2, available at -* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). -* -* Notwithstanding the above, under no circumstances may you combine this -* software in any way with any other Broadcom software provided under a -* license other than the GPL, without Broadcom's express prior written -* consent. -*****************************************************************************/ - - -#ifndef CSP_MODULE_H -#define CSP_MODULE_H - -/* ---- Include Files ---------------------------------------------------- */ - -#ifdef __KERNEL__ - #include <linux/module.h> -#else - #define EXPORT_SYMBOL(symbol) -#endif - -/* ---- Public Constants and Types --------------------------------------- */ -/* ---- Public Variable Externs ------------------------------------------ */ -/* ---- Public Function Prototypes --------------------------------------- */ - - -#endif /* CSP_MODULE_H */ |