A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2008-08-28 12:34:01 -07:00
commit 604a2785a8
217 changed files with 200 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/input/keyboard/bf54x-keys.c
View file

@ -43,7 +43,7 @@
#include <linux/input.h>
#include <asm/portmux.h>
#include <asm/mach/bf54x_keys.h>
#include <mach/bf54x_keys.h>
#define DRV_NAME "bf54x-keys"
#define TIME_SCALE 100 /* 100 ns */

2
drivers/serial/bfin_5xx.c
View file

@ -28,7 +28,7 @@
#endif
#include <asm/gpio.h>
#include <asm/mach/bfin_serial_5xx.h>
#include <mach/bfin_serial_5xx.h>
#ifdef CONFIG_SERIAL_BFIN_DMA
#include <linux/dma-mapping.h>

2
drivers/video/bf54x-lq043fb.c
View file

@ -58,7 +58,7 @@
#include <asm/gpio.h>
#include <asm/portmux.h>
#include <asm/mach/bf54x-lq043.h>
#include <mach/bf54x-lq043.h>
#define NO_BL_SUPPORT