You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tony Lindgren a9f82d10d1 omap: Fix incorrect 730 vs 850 detection ... Commit cd92204924 added support for omap850. However, the patch accidentally removed the wrong ifdef: # define cpu_is_omap730() 1 # endif #endif +#else +# if defined(CONFIG_ARCH_OMAP850) +# undef cpu_is_omap850 +# define cpu_is_omap850() 1 +# endif +#endif ... void omap2_check_revision(void); #endif /* defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) */ - -#endif Instead of removing removing the #endif at the end of the file, the #endif before #else should have been removed. But we cannot have multiple #else statements as pointed out by Alistair Buxton <a.j.buxton@gmail.com>. So the fix is to: - remove the non-multi-omap special handling, as we need to detect between omap730 and omap850 anyways. - add the missing #endif back to the end of the file Reported-by: Sanjeev Premi <premi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>		16 years ago
..
boot	kbuild: use INSTALLKERNEL to select customized installkernel script	16 years ago
common	ARM: 5735/1: sa1111: CodingStyle cleanups	16 years ago
configs	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop	16 years ago
include/asm	ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()	16 years ago
kernel	ARM: 5727/1: Pass IFSR register to do_PrefetchAbort()	16 years ago
lib	Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6	16 years ago
mach-aaec2000	…
mach-at91	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
mach-bcmring	ARM: 5733/1: fix bcmring compile error	16 years ago
mach-clps711x	…
mach-davinci	ARM: includecheck fix: mach-davinci, board-dm365-evm.c	16 years ago
mach-ebsa110	…
mach-ep93xx	ep93xx video driver platform support	16 years ago
mach-footbridge	…
mach-gemini	…
mach-h720x	…
mach-integrator	ARM: Fix section mismatch warning in Integrator pci_v3	16 years ago
mach-iop13xx	Merge branch 'iop-raid6' into async-tx-next	16 years ago
mach-iop32x	iop3xx: ATU and PCI memory configuration corrected	16 years ago
mach-iop33x	iop3xx: ATU and PCI memory configuration corrected	16 years ago
mach-ixp4xx	ixp4xx: arch_idle() documentation fixup	16 years ago
mach-ixp23xx	…
mach-ixp2000	…
mach-kirkwood	Merge branch 'master' into devel	16 years ago
mach-ks8695	ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers	16 years ago
mach-l7200	…
mach-lh7a40x	…
mach-loki	…
mach-mmp	…
mach-msm	…
mach-mv78xx0	[ARM] orion: convert gpio to use gpiolib	16 years ago
mach-mx1	ARM: mxc: Fix i2c_board_info definitions	16 years ago
mach-mx2	mx21ads: Fix framebuffer platform data	16 years ago
mach-mx3	Merge branch 'master' into devel	16 years ago
mach-mx25	Freescale i.MX25 PDK (3ds) board support	16 years ago
mach-mxc91231	MXC: add iomux pins configuration support for MXC91231	16 years ago
mach-netx	netx: Use get_irqnr_preamble to initialize base register	16 years ago
mach-nomadik	mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board)	16 years ago
mach-ns9xxx	const: constify remaining file_operations	16 years ago
mach-omap1	omap: Fix wrong jtag_id for 850	16 years ago
mach-omap2	omap: Fix wrong condition check in while loop for mailbox and iommu2	16 years ago
mach-orion5x	[ARM] orion5x: Add LaCie NAS 2Big Network support	16 years ago
mach-pnx4008	…
mach-pxa	Merge branch 'master' into for-linus	16 years ago
mach-realview	ARM: 5720/1: Move MMCI header to amba include dir	16 years ago
mach-rpc	…
mach-s3c24a0/include/mach	ARM: S3C: move s3c_device_nand from plat-s3c24xx to plat-s3c	16 years ago
mach-s3c2400	…
mach-s3c2410	ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs.	16 years ago
mach-s3c2412	ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs.	16 years ago
mach-s3c2440	ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs.	16 years ago
mach-s3c2442	[ARM] GTA02: build fixes (s3c2410_nand_set usage)	16 years ago
mach-s3c2443	…
mach-s3c6400	ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs.	16 years ago
mach-s3c6410	ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs.	16 years ago
mach-s5pc100	ARM: S5PC100: Board and configuration file	16 years ago
mach-sa1100	ARM: Remove unused CONFIG SA1100_H3XXX	16 years ago
mach-shark	…
mach-stmp37xx	…
mach-stmp378x	…
mach-u300	ARM: 5731/2: Fix U300 generic GPIO, remove ifdefs from MMCI v3	16 years ago
mach-versatile	ARM: 5720/1: Move MMCI header to amba include dir	16 years ago
mach-w90x900	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	16 years ago
mm	ARM: 5728/1: Proper prefetch abort handling on ARMv6 and ARMv7	16 years ago
nwfpe	…
oprofile	…
plat-iop	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop	16 years ago
plat-mxc	spi: add SPI driver for most known i.MX SoCs	16 years ago
plat-omap	omap: Fix incorrect 730 vs 850 detection	16 years ago
plat-orion	[ARM] Kirkwood: __init requires linux/init.h	16 years ago
plat-pxa	[ARM] pxa/dma: add debugfs entries	16 years ago
plat-s3c	ARM: s3c: fix check of index into s3c_gpios[]	16 years ago
plat-s3c24xx	s3cmci: add better support for no card detect or write protect available	16 years ago
plat-s3c64xx	Merge branch 'next-s3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux	16 years ago
plat-s5pc1xx	ARM: S5PC100: Kconfigs and Makefiles	16 years ago
plat-stmp3xxx	ARM: STMP3xxx: deallocation with negative index of descriptors[]	16 years ago
tools	[ARM] Update mach-types	16 years ago
vfp	Thumb-2: Implement the unified VFP support	16 years ago
Kconfig	ARM: 5580/2: ARM TCM (Tightly-Coupled Memory) support v3	16 years ago
Kconfig-nommu	…
Kconfig.debug	Thumb-2: Add Thumb-2 support to the build files	16 years ago
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	16 years ago