kernel-fxtec-pro1x/arch/arm/configs
Linus Torvalds 63a93699c6 Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6629/2: aaec2000: remove support for mach-aaec2000
  ARM: lh7a40x: remove unmaintained platform support

Fix up trivial conflicts in
 - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
 - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)
2011-03-16 19:05:40 -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
at91sam9261ek_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
at91sam9263ek_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
at572d940hfek_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -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: reduce defconfigs 2010-06-10 07:12:18 +02: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 kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
dove_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08: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
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: support for Seagate DockStar 2010-09-19 22:43:44 -04: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
loki_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08: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: reduce defconfigs 2010-06-10 07:12:18 +02: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 kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08: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 kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
neocore926_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +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 ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
nhk8815_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ns9xxx_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02: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 kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08: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-smp_defconfig ARM: 6369/1: Update RealView SMP defconfig 2010-10-08 10:02:26 +01:00
realview_defconfig ARM: 6365/1: Update RealView defconfig 2010-10-08 10:02:25 +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: s5p64x0_defconfig: Update for support S5P6440 and S5P6450 2010-10-18 18:33:04 +09:00
s5p6442_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s5pc100_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
s5pv210_defconfig ARM: s5pv210_defconfig: Update for removing s5pc110_defconfig 2010-08-05 18:31:01 +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
spear300_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
spear310_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
spear320_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
spear600_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02: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
stmp37xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
stmp378x_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tct_hammer_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tegra_defconfig ARM: tegra: add tegra_defconfig 2011-02-10 17:50:42 -08: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 ux500: allow 5500 and 8500 to be built together 2011-01-10 18:34:54 +01:00
usb-a9260_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
usb-a9263_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
versatile_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00
viper_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
xcep_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
zeus_defconfig ARM: reduce defconfigs 2010-06-10 07:12:18 +02:00