Skip to content

Commit

Permalink
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
Browse files Browse the repository at this point in the history 
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  VIDEO: cyberpro: pci_request_regions needs a persistent name
  ARM: dma-isa: request cascade channel after registering it
  ARM: footbridge: trim down old ISA rtc setup
  ARM: fix PAGE_KERNEL
  ARM: Fix wrong shared bit for CPU write buffer bug test
  ARM: 5857/1: ARM: dmabounce: fix build
  ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
  ARM: 5855/1: putc support for nuc900
  ARM: 5854/1: fix compiling error for NUC900
  ARM: 5849/1: ARMv7: fix Oprofile events count
  ARM: add missing include to nwflash.c
  ARM: Kill CONFIG_CPU_32
  ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
  ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
  • Loading branch information
Linus Torvalds committed Dec 24, 2009
2 parents eec74a4 + ed5a35a commit 756fe28
Show file tree
Hide file tree
Showing 182 changed files with 320 additions and 553 deletions.
2 changes: 1 addition & 1 deletion arch/arm/common/dmabounce.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ static inline void unmap_single(struct device *dev, dma_addr_t dma_addr,
* we need to ensure that the data will be coherent
* with user mappings.
*/
__cpuc_flush_kernel_dcache_area(ptr, size);
__cpuc_flush_dcache_area(ptr, size);
}
free_safe_buffer(dev->archdata.dmabounce, buf);
}
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/acs5k_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ CONFIG_MACH_ACS5K=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM922T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/acs5k_tiny_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ CONFIG_MACH_ACS5K=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM922T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/afeb9260_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/am200epdkit_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ CONFIG_PXA25x=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/am3517_evm_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ CONFIG_MACH_OMAP3517EVM=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_V7=y
CONFIG_CPU_32v7=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/ams_delta_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ CONFIG_OMAP_ARM_150MHZ=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM925T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/assabet_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ CONFIG_SA1100_ASSABET=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91cap9adk_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ CONFIG_AT91_TIMER_HZ=100
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91rm9200dk_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91rm9200ek_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91sam9260ek_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ CONFIG_AT91_TIMER_HZ=100
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91sam9261ek_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ CONFIG_AT91_TIMER_HZ=100
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91sam9263ek_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ CONFIG_AT91_TIMER_HZ=100
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91sam9g20ek_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91sam9rlek_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ CONFIG_AT91_TIMER_HZ=100
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/ateb9200_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ CONFIG_MACH_ATEB9200=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/badge4_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ CONFIG_SA1100_BADGE4=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/bcmring_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ CONFIG_BCM_ZRELADDR=0x8000
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_V6=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_32v6=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cam60_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/carmeva_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ CONFIG_MACH_CARMEVA=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cerfcube_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ CONFIG_SA1100_CERF_FLASH_16MB=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cm_t35_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ CONFIG_MACH_CM_T35=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_V7=y
CONFIG_CPU_32v7=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cm_x2xx_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ CONFIG_PXA_SSP=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cm_x300_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ CONFIG_PLAT_PXA=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSC3=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/colibri_pxa270_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ CONFIG_PXA27x=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/colibri_pxa300_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ CONFIG_PXA3xx=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSC3=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/collie_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ CONFIG_SA1100_COLLIE=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/corgi_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ CONFIG_PXA_HAVE_BOARD_IRQS=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cpu9260_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cpu9g20_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/cpuat91_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/csb337_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ CONFIG_AT91_TIMER_HZ=128
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/csb637_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/da8xx_omapl_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ CONFIG_DAVINCI_RESET_CLOCKS=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/davinci_all_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ CONFIG_DAVINCI_RESET_CLOCKS=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/dove_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ CONFIG_PLAT_ORION=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_V6=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_32v6=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/ebsa110_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ CONFIG_ARCH_EBSA110=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_SA110=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/ecbat91_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/edb7211_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ CONFIG_ARCH_EP7211=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM720T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_LV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/em_x270_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ CONFIG_PXA_SSP=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/ep93xx_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ CONFIG_EP93XX_EARLY_UART1=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/eseries_pxa_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ CONFIG_PXA_HAVE_BOARD_IRQS=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/ezx_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ CONFIG_PLAT_PXA=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/footbridge_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ CONFIG_ARCH_EBSA285=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_SA110=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/fortunet_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ CONFIG_ARCH_FORTUNET=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM720T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_LV4T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/h3600_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ CONFIG_SA1100_H3600=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/h5000_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ CONFIG_PXA25x=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/h7201_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ CONFIG_CPU_H7201=y
#
# Processor Type
#
CONFIG_CPU_32=y
CONFIG_CPU_ARM720T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_LV4T=y
Expand Down
Loading

0 comments on commit 756fe28

Please sign in to comment.