diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 12:34:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 12:34:01 -0700 |
| commit | 604a2785a8482cad4d63202465133c720db5eda7 (patch) | |
| tree | e2f510a8a54d7d4443cb52f3a0be46f527ebb779 /include/asm-blackfin/fb.h | |
| parent | 66833d5f3934a19d0988b7d0de58149bfd7a5884 (diff) | |
| parent | d310fb4bb73629840430cb13cb282915e49fef4b (diff) | |
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
Diffstat (limited to 'include/asm-blackfin/fb.h')
| -rw-r--r-- | include/asm-blackfin/fb.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-blackfin/fb.h b/include/asm-blackfin/fb.h deleted file mode 100644 index c7df3803099..00000000000 --- a/include/asm-blackfin/fb.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ -#include <linux/fb.h> - -#define fb_pgprotect(...) do {} while (0) - -static inline int fb_is_primary_device(struct fb_info *info) -{ - return 0; -} - -#endif /* _ASM_FB_H_ */ |