Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
  Blackfin arch: sram: use 'unsigned long' for irqflags
  Blackfin arch: let PCI depend on BROKEN
  Blackfin arch: move include/asm-blackfin header files to arch/blackfin
  Blackfin arch: fix bug - MPU crashes under stress
  Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
  Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
  Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK

1 files changed, 0 insertions, 32 deletions

diff --git a/include/asm-blackfin/mmu.h b/include/asm-blackfin/mmu.h
deleted file mode 100644
index 757e43906ed4..000000000000
--- a/include/asm-blackfin/mmu.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __MMU_H
-#define __MMU_H
-
-/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */
-
-struct sram_list_struct {
-        struct sram_list_struct *next;
-        void *addr;
-        size_t length;
-};
-
-typedef struct {
-        struct vm_list_struct *vmlist;
-        unsigned long end_brk;
-        unsigned long stack_start;
-
-        /* Points to the location in SDRAM where the L1 stack is normally
-           saved, or NULL if the stack is always in SDRAM.  */
-        void *l1_stack_save;
-
-        struct sram_list_struct *sram_list;
-
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-        unsigned long   exec_fdpic_loadmap;
-        unsigned long   interp_fdpic_loadmap;
-#endif
-#ifdef CONFIG_MPU
-        unsigned long *page_rwx_mask;
-#endif
-} mm_context_t;
-
-#endif