OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b380ab4f85
linux/arch/arm/configs
History
Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
  ARM: S5P64X0: External Interrupt Support
  ARM: EXYNOS4: Enable MFC on Samsung NURI
  ARM: EXYNOS4: Enable MFC on universal_c210
  ARM: S5PV210: Enable MFC on Goni
  ARM: S5P: Add support for MFC device
  ARM: EXYNOS4: Add support FIMD on SMDKC210
  ARM: EXYNOS4: Add platform device and helper functions for FIMD
  ARM: EXYNOS4: Add resource definition for FIMD
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: SAMSUNG: Add IRQ_I2S0 definition
  ARM: SAMSUNG: Add platform device for idma
  ARM: EXYNOS4: Add more registers to be saved and restored for PM
  ARM: EXYNOS4: Add more register addresses of CMU
  ARM: EXYNOS4: Add platform device for dwmci driver
  ARM: EXYNOS4: configure rtc-s3c on NURI
  ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
  ARM: EXYNOS4: configure ADC on NURI
  ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
  ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
  ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
  ...

Fix up tons of silly conflicts:
 - arch/arm/mach-davinci/include/mach/psc.h
 - arch/arm/mach-exynos4/Kconfig
 - arch/arm/mach-exynos4/mach-smdkc210.c
 - arch/arm/mach-exynos4/pm.c
 - arch/arm/mach-imx/mm-imx1.c
 - arch/arm/mach-imx/mm-imx21.c
 - arch/arm/mach-imx/mm-imx25.c
 - arch/arm/mach-imx/mm-imx27.c
 - arch/arm/mach-imx/mm-imx31.c
 - arch/arm/mach-imx/mm-imx35.c
 - arch/arm/mach-mx5/mm.c
 - arch/arm/mach-s5pv210/mach-goni.c
 - arch/arm/mm/Kconfig
2011-07-26 17:41:04 -07:00
..
acs5k_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
acs5k_tiny_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
afeb9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
ag5evm_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
am200epdkit_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ap4evb_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
assabet_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
at91cap9adk_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
at91rm9200_defconfig at91: merge all at91rm9200 defconfig in one single file 2010-11-30 10:59:15 +01:00
at91sam9g20ek_defconfig AT91: at91sam9g20ek: merge 2mmc version in one board 2010-10-07 19:56:31 +02:00
at91sam9rlek_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
at91sam9260ek_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
at91sam9261_defconfig at91sam9261: rename at91sam9261ek to at91sam9261 defconfig 2011-05-25 23:04:33 +08:00
at91sam9263_defconfig at91sam9263: merge all boards defconfig into only one 2011-05-25 23:04:32 +08:00
at91x40_defconfig arm: at91: minimal defconfig for at91x40 SoC 2011-04-23 11:03:06 +08:00
badge4_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
bcmring_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
cam60_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
cerfcube_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
cm_x2xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
cm_x300_defconfig ARM: pxa/cm-x300: update cm_x300_defconfig 2011-07-11 14:43:28 +08:00
cns3420vb_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
colibri_pxa270_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
colibri_pxa300_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
collie_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
corgi_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
cpu9g20_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
cpu9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
da8xx_omapl_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
davinci_all_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
dove_defconfig ARM: Sync Marvell Dove defconfig with latest kernel 2011-05-03 15:38:52 -04:00
ebsa110_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
edb7211_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
em_x270_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ep93xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
eseries_pxa_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
exynos4_defconfig ARM: exynos4_defconfig: Update for adding machines 2011-05-06 09:36:48 +09:00
ezx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
footbridge_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
fortunet_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
g3evm_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
g4evm_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
h3600_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
h5000_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
h7201_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
h7202_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
hackkit_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
imote2_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
integrator_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
iop13xx_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
iop32x_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
iop33x_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
ixp4xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ixp23xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ixp2000_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
jornada720_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
kirkwood_defconfig [ARM] Kirkwood: add LaCie d2 Network v2 to defconfig 2011-03-03 16:27:01 -05:00
ks8695_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
lart_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
lpd270_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
lubbock_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
mackerel_defconfig ARM: mach-shmobile: mackerel: Add mackerel defconfig 2010-11-29 13:25:22 +09:00
magician_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mainstone_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
mini2440_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
mmp2_defconfig ARM: mmp2: update mmp2_defconfig to support mmc 2011-07-20 17:20:52 -04:00
msm_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
mv78xx0_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mx1_defconfig MX1: Add ARMadeus Systems APF9328 board support 2011-05-19 13:11:37 +02:00
mx3_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mx21_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mx27_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mx51_defconfig mx51: Let USB Storage be built by default 2011-07-07 08:45:00 +02:00
mxs_defconfig ARM: mxs_defconfig: Add mx23evk and mx28evk build 2011-07-07 10:01:06 +02:00
neponset_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
netwinder_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
netx_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
nhk8815_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
nuc910_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
nuc950_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
nuc960_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
omap1_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
omap2plus_defconfig omap: Run make savedefconfig on omap2plus_defconfig to shrink it 2011-05-03 02:38:02 -07:00
orion5x_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
palmz72_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pcm027_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pcontrol_g20_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pleb_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pnx4008_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
pxa3xx_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pxa168_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pxa255-idp_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
pxa910_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
qil-a9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
raumfeld_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
realview_defconfig ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
realview-smp_defconfig ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
rpc_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s3c2410_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s3c6400_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s5p64x0_defconfig ARM: S5P: Update defconfig for HRT support 2011-03-12 08:05:19 +09:00
s5pc100_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s5pv210_defconfig ARM: S5P: Update defconfig for HRT support 2011-03-12 08:05:19 +09:00
sam9_l9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
shannon_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
shark_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
simpad_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
spear3xx_defconfig ARM: 6932/1: SPEAr3xx: Replace defconfigs with single unified defconfig 2011-05-20 22:34:25 +01:00
spear6xx_defconfig ARM: 6933/1: SPEAR6xx: Rename spear600_defconfig as spear6xx_defconfig 2011-05-20 22:34:25 +01:00
spitz_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
stamp9g20_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
tct_hammer_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tegra_defconfig ARM: tegra: update defconfig 2011-03-15 14:28:34 -07:00
trizeps4_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
u300_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
u8500_defconfig mach-ux500: add configs for snowball board 2011-06-23 12:04:56 +02:00
usb-a9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
versatile_defconfig ARM: 6907/1: Versatile: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
vexpress_defconfig ARM: 6647/1: add Versatile Express defconfig 2011-02-19 10:55:12 +00:00
viper_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
xcep_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
zeus_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00