Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b821bfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: make sure cycles is marked as volatile so gcc doesnt reorder on us
  Blackfin arch: disable CONFIG_HW_RANDOM and CONFIG_DAB in defconfig files
  Blackfin arch: update cache flush prototypes with argument names to make them less mysterious
  Blackfin arch: move bfin_addr_dcachable() and friends into the cacheflush header where it belongs
  Blackfin arch: use the new bfin_addr_dcachable() function
  Blackfin arch: fix bug - build kernel failed at head.S when reprogram clock on all platforms
  Blackfin arch: unify/cleanup cache code
  Blackfin arch: update AD7879 platform resources in board file
  Blackfin arch: Zero out bss region in L1/L2 memory.
  Blackfin arch: add read/write IO accessor functions to Blackfin
  Blackfin arch: fix bug - some serial header files set RTS to an input when they should all be outputs
parents a45fbc33 1390da4e

arch/blackfin/configs/BF526-EZBRD_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ CONFIG_BFIN_OTP=y 
#

# CONFIG_CAN4LINUX is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

arch/blackfin/configs/BF527-EZKIT_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ CONFIG_UNIX98_PTYS=y 
#

# CONFIG_CAN4LINUX is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

arch/blackfin/configs/BF533-EZKIT_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ CONFIG_UNIX98_PTYS=y 
#

# CONFIG_CAN4LINUX is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set
@@ -740,7 +740,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

CONFIG_DAB=y

# CONFIG_DAB is not set



#

# Graphics support

arch/blackfin/configs/BF533-STAMP_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ CONFIG_UNIX98_PTYS=y 
#

# CONFIG_CAN4LINUX is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

arch/blackfin/configs/BF537-STAMP_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ CONFIG_CAN4LINUX=y 
# CONFIG_CAN_UNCTWINCAN is not set

CONFIG_CAN_BLACKFIN=m

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_GEN_RTC is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set
@@ -871,7 +871,7 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

CONFIG_DAB=y

# CONFIG_DAB is not set



#

# Graphics support