Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/git/gerg/m68knommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: update the default config for the ColdFire 5407C3 board
  m68knommu: update the default config for the ColdFire 5307C3 board
  m68knommu: update the default config for the ColdFire 5257EVB board
  m68knommu: update the default config for the ColdFire 5249EVB.
  m68knommu: add a defconfig for the ColdFire M5272C3 board
  m68knommu: update the defconfig for the ColdFire 5208evb board
  m68knommu: fix DMA support for ColdFire
  m68knommu: remove unused kernel stats offsets
  m68knommu: fix missing .data.cacheline_aligned section
  m68knommu: Fixed GPIO pin initialization for CONFIG_M5271 FEC.
  • Loading branch information
@torvalds
torvalds committed Apr 24, 2009
2 parents a4277bf + 64f6841 commit 9fe9293
Show file tree
Hide file tree
Showing 11 changed files with 1,346 additions and 358 deletions.
1 change: 1 addition & 0 deletions arch/m68knommu/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ config MMU

config NO_DMA
bool
depends on !COLDFIRE
default y

config FPU
Expand Down
Loading

0 comments on commit 9fe9293

Please sign in to comment.