diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 10:58:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 10:58:34 -0700 |
| commit | 5872c84027fdcc982e8109ca26d11e1117995745 (patch) | |
| tree | f4b59f792a24526c0d2f1ffe3fa8d743b5693f1d /arch/microblaze/include | |
| parent | 39eda2aba6be642b71f2e0ad623dcb09fd9d79cf (diff) | |
| parent | 54ea21f0785fd01fb3279d42fe6670cef64cf648 (diff) | |
Merge tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull Microblaze patches from Michal Simek:
- PCI fixes
- Selfmod code removing
- Intc and timer fixes
- Adding new MB versions
- Minor fixes
* tag 'microblaze-3.12-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Show message when reset gpio is not present
microblaze: Add linux.bin.ub target
microblaze: Add PVR version string for MB v9.0 and v9.1
microblaze: timer: Replace microblaze_ prefix by xilinx_
microblaze: timer: Update header
microblaze: timer: Remove unused header
microblaze: timer: Clear driver init function
microblaze: timer: Use CLKSRC_OF initialization
microblaze: intc: Remove unused header
microblaze: intc: Clean driver init function
microblaze: intc: Using irqchip
microblaze: intc: Update header
microblaze: intc: Remove unused headers
microblaze: Remove selfmodified feature
of/pci: Use of_pci_range_parser
Diffstat (limited to 'arch/microblaze/include')
| -rw-r--r-- | arch/microblaze/include/asm/selfmod.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/microblaze/include/asm/selfmod.h b/arch/microblaze/include/asm/selfmod.h deleted file mode 100644 index c42aff2e6cd0..000000000000 --- a/arch/microblaze/include/asm/selfmod.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu> - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ - -#ifndef _ASM_MICROBLAZE_SELFMOD_H -#define _ASM_MICROBLAZE_SELFMOD_H - -/* - * BARRIER_BASE_ADDR is constant address for selfmod function. - * do not change this value - selfmod function is in - * arch/microblaze/kernel/selfmod.c: selfmod_function() - * - * last 16 bits is used for storing register offset - */ - -#define BARRIER_BASE_ADDR 0x1234ff00 - -void selfmod_function(const int *arr_fce, const unsigned int base); - -#endif /* _ASM_MICROBLAZE_SELFMOD_H */ |