From 2261b68163f13ff8578cddac3d89853c0e55a2f7 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Tue, 30 Aug 2011 10:58:22 +0200 Subject: [PATCH] --- yaml --- r: 263624 b: refs/heads/master c: 3b217116edaac634bf31e85c35708298059a8171 h: refs/heads/master v: v3 --- [refs] | 2 +- .../feature-removal-schedule.txt | 8 - trunk/Documentation/power/runtime_pm.txt | 3 +- trunk/MAINTAINERS | 15 +- trunk/Makefile | 2 +- trunk/arch/alpha/include/asm/sysinfo.h | 9 + trunk/arch/alpha/include/asm/thread_info.h | 8 +- trunk/arch/alpha/kernel/osf_sys.c | 12 +- trunk/arch/alpha/kernel/systbls.S | 2 +- trunk/arch/arm/Kconfig | 12 -- trunk/arch/arm/boot/compressed/mmcif-sh7372.c | 2 +- trunk/arch/arm/boot/compressed/sdhi-sh7372.c | 2 +- .../arm/include/asm/hardware/cache-l2x0.h | 2 +- trunk/arch/arm/include/asm/pmu.h | 10 +- trunk/arch/arm/kernel/calls.S | 2 +- trunk/arch/arm/kernel/pmu.c | 26 +-- trunk/arch/arm/kernel/relocate_kernel.S | 3 +- trunk/arch/arm/kernel/setup.c | 15 +- trunk/arch/arm/kernel/smp_twd.c | 4 +- trunk/arch/arm/mach-at91/at91sam9261.c | 2 +- .../arm/mach-ep93xx/include/mach/ts72xx.h | 26 +-- trunk/arch/arm/mach-exynos4/clock.c | 2 +- trunk/arch/arm/mach-exynos4/cpu.c | 11 +- .../arch/arm/mach-exynos4/include/mach/irqs.h | 5 +- .../arm/mach-exynos4/include/mach/regs-pmu.h | 2 - trunk/arch/arm/mach-exynos4/irq-eint.c | 7 - .../arm/mach-exynos4/mach-universal_c210.c | 4 +- trunk/arch/arm/mach-exynos4/setup-usb-phy.c | 2 +- trunk/arch/arm/mach-footbridge/Kconfig | 1 - trunk/arch/arm/mach-footbridge/dc21285.c | 1 - trunk/arch/arm/mach-imx/mach-cpuimx27.c | 2 +- trunk/arch/arm/mach-imx/mach-cpuimx35.c | 2 +- .../arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 +- trunk/arch/arm/mach-orion5x/dns323-setup.c | 2 +- trunk/arch/arm/mach-orion5x/pci.c | 1 - .../arm/mach-realview/include/mach/system.h | 1 - trunk/arch/arm/mach-s3c64xx/pm.c | 1 - trunk/arch/arm/mach-s5p64x0/irq-eint.c | 2 +- trunk/arch/arm/mach-s5pv210/pm.c | 2 +- trunk/arch/arm/mach-shmobile/board-ag5evm.c | 3 +- trunk/arch/arm/mach-shmobile/board-ap4evb.c | 1 - trunk/arch/arm/mach-shmobile/board-mackerel.c | 5 - trunk/arch/arm/mach-shmobile/clock-sh7372.c | 31 +-- trunk/arch/arm/mach-shmobile/clock-sh73a0.c | 2 +- .../arm/mach-shmobile/include/mach/sh7372.h | 4 - trunk/arch/arm/mach-shmobile/intc-sh7372.c | 7 +- trunk/arch/arm/mach-shmobile/setup-sh7372.c | 176 ++---------------- trunk/arch/arm/mach-vexpress/v2m.c | 7 - trunk/arch/arm/mm/proc-arm920.S | 2 +- trunk/arch/arm/mm/proc-arm926.S | 2 +- trunk/arch/arm/mm/proc-sa1100.S | 10 +- trunk/arch/arm/mm/proc-v6.S | 16 -- trunk/arch/arm/mm/proc-v7.S | 6 +- trunk/arch/arm/mm/proc-xsc3.S | 6 +- trunk/arch/arm/plat-omap/omap_device.c | 3 +- trunk/arch/arm/plat-s5p/clock.c | 2 +- trunk/arch/arm/plat-s5p/irq-gpioint.c | 6 - .../arm/plat-samsung/include/plat/backlight.h | 2 +- trunk/arch/arm/plat-samsung/irq-vic-timer.c | 5 - trunk/arch/arm/tools/mach-types | 6 +- trunk/arch/avr32/kernel/syscall_table.S | 2 +- trunk/arch/blackfin/mach-common/entry.S | 2 +- trunk/arch/cris/arch-v10/kernel/entry.S | 2 +- trunk/arch/cris/arch-v32/kernel/entry.S | 2 +- trunk/arch/cris/include/asm/serial.h | 9 - trunk/arch/frv/kernel/entry.S | 2 +- trunk/arch/h8300/kernel/syscalls.S | 2 +- trunk/arch/ia64/kernel/entry.S | 2 +- trunk/arch/m32r/kernel/syscall_table.S | 2 +- trunk/arch/m68k/kernel/syscalltable.S | 2 +- trunk/arch/microblaze/kernel/syscall_table.S | 2 +- trunk/arch/mips/kernel/scall32-o32.S | 2 +- trunk/arch/mips/kernel/scall64-64.S | 2 +- trunk/arch/mips/kernel/scall64-n32.S | 2 +- trunk/arch/mips/kernel/scall64-o32.S | 2 +- trunk/arch/mn10300/kernel/entry.S | 2 +- trunk/arch/parisc/kernel/syscall_table.S | 2 +- trunk/arch/powerpc/boot/dts/p1023rds.dts | 2 +- .../powerpc/configs/85xx/p1023rds_defconfig | 1 - .../powerpc/configs/corenet32_smp_defconfig | 1 - .../powerpc/configs/corenet64_smp_defconfig | 5 +- trunk/arch/powerpc/configs/mpc85xx_defconfig | 1 - .../powerpc/configs/mpc85xx_smp_defconfig | 1 - trunk/arch/powerpc/include/asm/systbl.h | 2 +- trunk/arch/powerpc/sysdev/fsl_rio.c | 5 +- trunk/arch/s390/kernel/compat_wrapper.S | 6 + trunk/arch/s390/kernel/early.c | 14 +- trunk/arch/s390/kernel/ipl.c | 7 +- trunk/arch/s390/kernel/syscalls.S | 2 +- trunk/arch/sh/include/asm/ptrace.h | 2 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 1 - trunk/arch/sh/kernel/idle.c | 2 +- trunk/arch/sh/kernel/syscalls_32.S | 2 +- trunk/arch/sh/kernel/syscalls_64.S | 2 +- trunk/arch/sh/kernel/traps_32.c | 37 ---- trunk/arch/sparc/kernel/irq.h | 2 +- trunk/arch/sparc/kernel/setup_64.c | 10 +- trunk/arch/sparc/kernel/sys32.S | 1 + trunk/arch/sparc/kernel/systbls_32.S | 2 +- trunk/arch/sparc/kernel/systbls_64.S | 4 +- trunk/arch/x86/ia32/ia32entry.S | 2 +- trunk/arch/x86/include/asm/pvclock.h | 2 +- trunk/arch/x86/include/asm/unistd_64.h | 2 +- trunk/arch/x86/kernel/syscall_table_32.S | 2 +- trunk/arch/x86/platform/mrst/mrst.c | 4 +- trunk/arch/xtensa/include/asm/unistd.h | 2 +- trunk/drivers/base/devres.c | 1 - trunk/drivers/base/devtmpfs.c | 2 +- trunk/drivers/base/platform.c | 2 +- trunk/drivers/base/power/clock_ops.c | 40 ++-- trunk/drivers/bcma/main.c | 12 -- trunk/drivers/bluetooth/ath3k.c | 1 - trunk/drivers/bluetooth/btusb.c | 13 +- trunk/drivers/char/msm_smd_pkt.c | 5 +- trunk/drivers/clocksource/sh_cmt.c | 34 +--- trunk/drivers/firewire/sbp2.c | 4 - trunk/drivers/firmware/google/gsmi.c | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 2 - trunk/drivers/gpu/drm/i915/intel_display.c | 4 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 28 --- trunk/drivers/gpu/drm/radeon/ni.c | 4 - trunk/drivers/gpu/drm/radeon/radeon_clocks.c | 3 - trunk/drivers/gpu/drm/radeon/radeon_combios.c | 8 - trunk/drivers/leds/leds-ams-delta.c | 1 - trunk/drivers/leds/leds-bd2802.c | 5 - trunk/drivers/leds/leds-hp6xx.c | 1 - trunk/drivers/md/linear.h | 2 +- trunk/drivers/md/md.c | 16 +- trunk/drivers/md/raid5.c | 2 +- trunk/drivers/misc/Kconfig | 1 - trunk/drivers/misc/ab8500-pwm.c | 2 +- trunk/drivers/misc/fsa9480.c | 4 +- trunk/drivers/misc/pti.c | 2 - trunk/drivers/misc/ti-st/st_core.c | 10 +- trunk/drivers/misc/ti-st/st_kim.c | 33 ---- trunk/drivers/misc/ti-st/st_ll.c | 19 -- trunk/drivers/net/can/ti_hecc.c | 3 +- trunk/drivers/net/cassini.c | 3 +- trunk/drivers/net/ibmveth.c | 12 +- trunk/drivers/net/phy/national.c | 17 +- trunk/drivers/net/rionet.c | 23 ++- trunk/drivers/net/sh_eth.c | 1 - .../net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 4 - .../drivers/net/wireless/ath/carl9170/main.c | 4 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.c | 14 +- trunk/drivers/net/wireless/wl12xx/main.c | 1 - trunk/drivers/net/wireless/wl12xx/sdio.c | 2 +- trunk/drivers/net/wireless/wl12xx/testmode.c | 45 +++++ trunk/drivers/rapidio/rio-scan.c | 3 +- trunk/drivers/rtc/rtc-s3c.c | 79 +++++--- trunk/drivers/s390/block/dasd_ioctl.c | 10 +- trunk/drivers/s390/char/sclp_cmd.c | 6 +- trunk/drivers/sh/intc/chip.c | 3 - .../drivers/staging/brcm80211/brcmsmac/otp.c | 1 - .../staging/brcm80211/brcmsmac/types.h | 1 - trunk/drivers/staging/octeon/ethernet-rgmii.c | 1 - trunk/drivers/staging/octeon/ethernet-spi.c | 1 - .../staging/tidspbridge/core/dsp-clock.c | 1 + trunk/drivers/staging/zcache/tmem.c | 2 +- trunk/drivers/staging/zcache/zcache-main.c | 8 +- trunk/drivers/tty/pty.c | 17 +- trunk/drivers/tty/serial/8250.c | 8 +- trunk/drivers/tty/serial/8250_pci.c | 11 +- trunk/drivers/tty/serial/8250_pnp.c | 3 - trunk/drivers/tty/serial/atmel_serial.c | 8 +- trunk/drivers/tty/serial/max3107-aava.c | 2 +- trunk/drivers/tty/serial/max3107.c | 2 +- trunk/drivers/tty/serial/mrst_max3110.c | 2 +- trunk/drivers/tty/serial/omap-serial.c | 3 +- trunk/drivers/tty/serial/pch_uart.c | 3 +- trunk/drivers/tty/serial/samsung.c | 8 +- trunk/drivers/tty/serial/serial_core.c | 5 - trunk/drivers/tty/serial/sh-sci.c | 72 ++----- trunk/drivers/tty/serial/ucc_uart.c | 2 +- trunk/drivers/tty/tty_io.c | 3 +- trunk/drivers/usb/core/hcd.c | 2 - trunk/drivers/usb/gadget/f_phonet.c | 1 - trunk/drivers/usb/host/ehci-hub.c | 7 +- trunk/drivers/usb/host/ehci-s5p.c | 1 - trunk/drivers/usb/host/xhci-hub.c | 17 +- trunk/drivers/usb/host/xhci-ring.c | 90 +++------ trunk/drivers/usb/host/xhci.c | 28 +-- trunk/drivers/usb/musb/blackfin.c | 1 - trunk/drivers/usb/musb/cppi_dma.c | 26 +-- trunk/drivers/usb/musb/musb_core.h | 12 +- trunk/drivers/usb/musb/musb_gadget.c | 4 +- trunk/drivers/usb/musb/musb_regs.h | 6 +- trunk/drivers/usb/musb/tusb6010.c | 1 - trunk/drivers/usb/musb/tusb6010_omap.c | 1 - trunk/drivers/usb/musb/ux500_dma.c | 38 ++-- trunk/drivers/usb/serial/ftdi_sio.c | 20 +- trunk/drivers/usb/serial/option.c | 104 +---------- trunk/drivers/video/backlight/adp8870_bl.c | 2 +- trunk/drivers/video/backlight/ep93xx_bl.c | 2 +- trunk/drivers/video/backlight/pwm_bl.c | 9 - trunk/drivers/w1/masters/ds2490.c | 4 +- trunk/drivers/w1/masters/matrox_w1.c | 4 +- trunk/drivers/w1/slaves/w1_ds2408.c | 2 +- trunk/drivers/w1/slaves/w1_smem.c | 4 +- trunk/drivers/w1/slaves/w1_therm.c | 4 +- trunk/drivers/w1/w1.c | 4 +- trunk/drivers/w1/w1.h | 2 +- trunk/drivers/w1/w1_family.c | 2 +- trunk/drivers/w1/w1_family.h | 2 +- trunk/drivers/w1/w1_int.c | 2 +- trunk/drivers/w1/w1_int.h | 2 +- trunk/drivers/w1/w1_io.c | 2 +- trunk/drivers/w1/w1_log.h | 2 +- trunk/drivers/w1/w1_netlink.c | 2 +- trunk/drivers/w1/w1_netlink.h | 2 +- trunk/fs/compat.c | 5 + trunk/fs/ext4/ext4.h | 1 - trunk/fs/ext4/inode.c | 3 + trunk/fs/ext4/page-io.c | 18 +- trunk/fs/xfs/xfs_iops.c | 14 +- trunk/fs/xfs/xfs_super.c | 36 ++-- trunk/include/asm-generic/unistd.h | 2 +- trunk/include/linux/compat.h | 1 + trunk/include/linux/connector.h | 2 +- trunk/include/linux/pwm_backlight.h | 1 - trunk/include/linux/rio_regs.h | 18 +- trunk/include/linux/syscalls.h | 3 + trunk/include/linux/ti_wilink_st.h | 27 +-- trunk/include/linux/tty.h | 2 - trunk/include/linux/tty_driver.h | 3 - trunk/include/net/cfg80211.h | 3 - trunk/kernel/printk.c | 2 +- trunk/kernel/sys_ni.c | 1 + trunk/lib/Makefile | 4 +- trunk/mm/memcontrol.c | 26 ++- trunk/mm/vmscan.c | 19 +- trunk/net/bluetooth/af_bluetooth.c | 6 +- trunk/net/bluetooth/bnep/bnep.h | 1 - trunk/net/bluetooth/bnep/core.c | 13 +- trunk/net/bluetooth/cmtp/capi.c | 3 +- trunk/net/bluetooth/cmtp/cmtp.h | 1 - trunk/net/bluetooth/cmtp/core.c | 20 +- trunk/net/bluetooth/hci_core.c | 8 +- trunk/net/bluetooth/hidp/core.c | 19 +- trunk/net/bluetooth/l2cap_core.c | 6 +- trunk/net/bluetooth/l2cap_sock.c | 30 +-- trunk/net/bluetooth/rfcomm/core.c | 17 +- trunk/net/bluetooth/rfcomm/sock.c | 28 +-- trunk/net/bluetooth/sco.c | 28 +-- trunk/net/bridge/br_multicast.c | 21 +-- trunk/net/core/neighbour.c | 8 +- trunk/net/core/netpoll.c | 4 +- trunk/net/ipv4/igmp.c | 2 +- trunk/net/ipv6/mcast.c | 2 +- trunk/net/mac80211/main.c | 2 +- trunk/net/socket.c | 10 +- trunk/net/wireless/core.c | 7 - trunk/net/wireless/sysfs.c | 6 +- trunk/scripts/checkpatch.pl | 3 +- trunk/scripts/get_maintainer.pl | 2 +- trunk/sound/pci/hda/patch_conexant.c | 57 +++--- trunk/sound/pci/hda/patch_realtek.c | 28 ++- trunk/sound/soc/blackfin/bf5xx-ad193x.c | 2 +- trunk/sound/soc/codecs/ad193x.c | 11 +- trunk/sound/soc/codecs/ad193x.h | 5 +- trunk/sound/soc/codecs/sta32x.c | 1 - trunk/sound/soc/codecs/wm8962.c | 12 +- trunk/sound/soc/codecs/wm8996.c | 28 +-- trunk/sound/soc/ep93xx/ep93xx-i2s.c | 5 +- trunk/sound/soc/fsl/fsl_dma.c | 2 - trunk/sound/soc/fsl/mpc8610_hpcd.c | 18 +- trunk/sound/soc/fsl/p1022_ds.c | 4 +- trunk/sound/soc/kirkwood/kirkwood-i2s.c | 2 +- trunk/sound/soc/omap/ams-delta.c | 6 +- trunk/sound/soc/samsung/Kconfig | 1 - trunk/sound/soc/samsung/h1940_uda1380.c | 1 - trunk/sound/soc/samsung/rx1950_uda1380.c | 1 - trunk/sound/soc/samsung/speyside_wm8962.c | 6 - trunk/sound/soc/soc-core.c | 2 +- trunk/sound/soc/soc-io.c | 23 --- trunk/sound/soc/soc-jack.c | 2 +- trunk/sound/soc/soc-pcm.c | 3 - trunk/sound/soc/tegra/tegra_wm8903.c | 4 +- trunk/tools/perf/arch/arm/util/dwarf-regs.c | 3 - 280 files changed, 772 insertions(+), 1650 deletions(-) delete mode 100644 trunk/arch/cris/include/asm/serial.h diff --git a/[refs] b/[refs] index 0d54e20075ba..e0b87fd8b3ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddf28352b80c86754a6424e3a61e8bdf9213b3c7 +refs/heads/master: 3b217116edaac634bf31e85c35708298059a8171 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 4dc465477665..c4a6e148732a 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -592,11 +592,3 @@ Why: In 3.0, we can now autodetect internal 3G device and already have interface that was used by acer-wmi driver. It will replaced by information log when acer-wmi initial. Who: Lee, Chun-Yi - ----------------------------- -What: The XFS nodelaylog mount option -When: 3.3 -Why: The delaylog mode that has been the default since 2.6.39 has proven - stable, and the old code is in the way of additional improvements in - the log code. -Who: Christoph Hellwig diff --git a/trunk/Documentation/power/runtime_pm.txt b/trunk/Documentation/power/runtime_pm.txt index 6066e3a6b9a9..4ce5450ab6e8 100644 --- a/trunk/Documentation/power/runtime_pm.txt +++ b/trunk/Documentation/power/runtime_pm.txt @@ -431,7 +431,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: void pm_runtime_irq_safe(struct device *dev); - set the power.irq_safe flag for the device, causing the runtime-PM - callbacks to be invoked with interrupts off + suspend and resume callbacks (but not the idle callback) to be invoked + with interrupts disabled void pm_runtime_mark_last_busy(struct device *dev); - set the power.last_busy field to the current time diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 28f65c249b97..069ee3b5c651 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1883,7 +1883,7 @@ S: Maintained F: drivers/connector/ CONTROL GROUPS (CGROUPS) -M: Paul Menage +M: Paul Menage M: Li Zefan L: containers@lists.linux-foundation.org S: Maintained @@ -1932,7 +1932,7 @@ S: Maintained F: tools/power/cpupower CPUSETS -M: Paul Menage +M: Paul Menage W: http://www.bullopensource.org/cpuset/ W: http://oss.sgi.com/projects/cpusets/ S: Supported @@ -2649,11 +2649,11 @@ F: drivers/net/wan/dlci.c F: drivers/net/wan/sdla.c FRAMEBUFFER LAYER -M: Florian Tobias Schandinat +M: Paul Mundt L: linux-fbdev@vger.kernel.org W: http://linux-fbdev.sourceforge.net/ Q: http://patchwork.kernel.org/project/linux-fbdev/list/ -T: git git://github.com/schandinat/linux-2.6.git fbdev-next +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git S: Maintained F: Documentation/fb/ F: Documentation/devicetree/bindings/fb/ @@ -4450,8 +4450,8 @@ M: "David S. Miller" L: netdev@vger.kernel.org W: http://www.linuxfoundation.org/en/Net W: http://patchwork.ozlabs.org/project/netdev/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git S: Maintained F: net/ F: include/net/ @@ -5532,7 +5532,6 @@ F: include/media/*7146* SAMSUNG AUDIO (ASoC) DRIVERS M: Jassi Brar -M: Sangbeom Kim L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/samsung @@ -7088,7 +7087,7 @@ S: Supported F: drivers/mmc/host/vub300.c W1 DALLAS'S 1-WIRE BUS -M: Evgeniy Polyakov +M: Evgeniy Polyakov S: Maintained F: Documentation/w1/ F: drivers/w1/ diff --git a/trunk/Makefile b/trunk/Makefile index 03d97aa8c73e..788511f86a62 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -rc5 +EXTRAVERSION = -rc3 NAME = "Divemaster Edition" # *DOCUMENTATION* diff --git a/trunk/arch/alpha/include/asm/sysinfo.h b/trunk/arch/alpha/include/asm/sysinfo.h index e77d77cd07b8..086aba284df2 100644 --- a/trunk/arch/alpha/include/asm/sysinfo.h +++ b/trunk/arch/alpha/include/asm/sysinfo.h @@ -27,4 +27,13 @@ #define UAC_NOFIX 2 #define UAC_SIGBUS 4 + +#ifdef __KERNEL__ + +/* This is the shift that is applied to the UAC bits as stored in the + per-thread flags. See thread_info.h. */ +#define UAC_SHIFT 6 + +#endif + #endif /* __ASM_ALPHA_SYSINFO_H */ diff --git a/trunk/arch/alpha/include/asm/thread_info.h b/trunk/arch/alpha/include/asm/thread_info.h index ff73db022342..6f32f9c84a2d 100644 --- a/trunk/arch/alpha/include/asm/thread_info.h +++ b/trunk/arch/alpha/include/asm/thread_info.h @@ -74,9 +74,9 @@ register struct thread_info *__current_thread_info __asm__("$8"); #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_POLLING_NRFLAG 8 /* poll_idle is polling NEED_RESCHED */ #define TIF_DIE_IF_KERNEL 9 /* dik recursion lock */ -#define TIF_UAC_NOPRINT 10 /* ! Preserve sequence of following */ -#define TIF_UAC_NOFIX 11 /* ! flags as they match */ -#define TIF_UAC_SIGBUS 12 /* ! userspace part of 'osf_sysinfo' */ +#define TIF_UAC_NOPRINT 10 /* see sysinfo.h */ +#define TIF_UAC_NOFIX 11 +#define TIF_UAC_SIGBUS 12 #define TIF_MEMDIE 13 /* is terminating due to OOM killer */ #define TIF_RESTORE_SIGMASK 14 /* restore signal mask in do_signal */ #define TIF_FREEZE 16 /* is freezing for suspend */ @@ -97,7 +97,7 @@ register struct thread_info *__current_thread_info __asm__("$8"); #define _TIF_ALLWORK_MASK (_TIF_WORK_MASK \ | _TIF_SYSCALL_TRACE) -#define ALPHA_UAC_SHIFT TIF_UAC_NOPRINT +#define ALPHA_UAC_SHIFT 10 #define ALPHA_UAC_MASK (1 << TIF_UAC_NOPRINT | 1 << TIF_UAC_NOFIX | \ 1 << TIF_UAC_SIGBUS) diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c index 01e8715e26d9..326f0a2d56e5 100644 --- a/trunk/arch/alpha/kernel/osf_sys.c +++ b/trunk/arch/alpha/kernel/osf_sys.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include @@ -634,10 +633,9 @@ SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer, case GSI_UACPROC: if (nbytes < sizeof(unsigned int)) return -EINVAL; - w = (current_thread_info()->flags >> ALPHA_UAC_SHIFT) & - UAC_BITMASK; - if (put_user(w, (unsigned int __user *)buffer)) - return -EFAULT; + w = (current_thread_info()->flags >> UAC_SHIFT) & UAC_BITMASK; + if (put_user(w, (unsigned int __user *)buffer)) + return -EFAULT; return 1; case GSI_PROC_TYPE: @@ -758,8 +756,8 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer, case SSIN_UACPROC: again: old = current_thread_info()->flags; - new = old & ~(UAC_BITMASK << ALPHA_UAC_SHIFT); - new = new | (w & UAC_BITMASK) << ALPHA_UAC_SHIFT; + new = old & ~(UAC_BITMASK << UAC_SHIFT); + new = new | (w & UAC_BITMASK) << UAC_SHIFT; if (cmpxchg(¤t_thread_info()->flags, old, new) != old) goto again; diff --git a/trunk/arch/alpha/kernel/systbls.S b/trunk/arch/alpha/kernel/systbls.S index 6acea1f96de3..b9c28f3f1956 100644 --- a/trunk/arch/alpha/kernel/systbls.S +++ b/trunk/arch/alpha/kernel/systbls.S @@ -360,7 +360,7 @@ sys_call_table: .quad sys_newuname .quad sys_nanosleep /* 340 */ .quad sys_mremap - .quad sys_ni_syscall /* old nfsservctl */ + .quad sys_nfsservctl .quad sys_setresuid .quad sys_getresuid .quad sys_pciconfig_read /* 345 */ diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 3269576dbfa8..5ebc5d922ea1 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1271,18 +1271,6 @@ config ARM_ERRATA_754327 This workaround defines cpu_relax() as smp_mb(), preventing correctly written polling loops from denying visibility of updates to memory. -config ARM_ERRATA_364296 - bool "ARM errata: Possible cache data corruption with hit-under-miss enabled" - depends on CPU_V6 && !SMP - help - This options enables the workaround for the 364296 ARM1136 - r0p2 erratum (possible cache data corruption with - hit-under-miss enabled). It sets the undocumented bit 31 in - the auxiliary control register and the FI bit in the control - register, thus disabling hit-under-miss without putting the - processor into full low interrupt latency mode. ARM11MPCore - is not affected. - endmenu source "arch/arm/common/Kconfig" diff --git a/trunk/arch/arm/boot/compressed/mmcif-sh7372.c b/trunk/arch/arm/boot/compressed/mmcif-sh7372.c index 672ae95db5c3..b6f61d9a5a1b 100644 --- a/trunk/arch/arm/boot/compressed/mmcif-sh7372.c +++ b/trunk/arch/arm/boot/compressed/mmcif-sh7372.c @@ -82,7 +82,7 @@ asmlinkage void mmc_loader(unsigned char *buf, unsigned long len) /* Disable clock to MMC hardware block */ - __raw_writel(__raw_readl(SMSTPCR3) | (1 << 12), SMSTPCR3); + __raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3); mmc_update_progress(MMC_PROGRESS_DONE); } diff --git a/trunk/arch/arm/boot/compressed/sdhi-sh7372.c b/trunk/arch/arm/boot/compressed/sdhi-sh7372.c index d279294f2381..d403a8b24d7f 100644 --- a/trunk/arch/arm/boot/compressed/sdhi-sh7372.c +++ b/trunk/arch/arm/boot/compressed/sdhi-sh7372.c @@ -85,7 +85,7 @@ asmlinkage void mmc_loader(unsigned short *buf, unsigned long len) goto err; /* Disable clock to SDHI1 hardware block */ - __raw_writel(__raw_readl(SMSTPCR3) | (1 << 13), SMSTPCR3); + __raw_writel(__raw_readl(SMSTPCR3) & (1 << 13), SMSTPCR3); mmc_update_progress(MMC_PROGRESS_DONE); diff --git a/trunk/arch/arm/include/asm/hardware/cache-l2x0.h b/trunk/arch/arm/include/asm/hardware/cache-l2x0.h index bfa706ffd968..16bd48031583 100644 --- a/trunk/arch/arm/include/asm/hardware/cache-l2x0.h +++ b/trunk/arch/arm/include/asm/hardware/cache-l2x0.h @@ -64,7 +64,7 @@ #define L2X0_AUX_CTRL_MASK 0xc0000fff #define L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT 16 #define L2X0_AUX_CTRL_WAY_SIZE_SHIFT 17 -#define L2X0_AUX_CTRL_WAY_SIZE_MASK (0x7 << 17) +#define L2X0_AUX_CTRL_WAY_SIZE_MASK (0x3 << 17) #define L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT 22 #define L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT 26 #define L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT 27 diff --git a/trunk/arch/arm/include/asm/pmu.h b/trunk/arch/arm/include/asm/pmu.h index b7e82c4aced6..67c70a31a1be 100644 --- a/trunk/arch/arm/include/asm/pmu.h +++ b/trunk/arch/arm/include/asm/pmu.h @@ -41,7 +41,7 @@ struct arm_pmu_platdata { * encoded error on failure. */ extern struct platform_device * -reserve_pmu(enum arm_pmu_type type); +reserve_pmu(enum arm_pmu_type device); /** * release_pmu() - Relinquish control of the performance counters @@ -62,26 +62,26 @@ release_pmu(enum arm_pmu_type type); * the actual hardware initialisation. */ extern int -init_pmu(enum arm_pmu_type type); +init_pmu(enum arm_pmu_type device); #else /* CONFIG_CPU_HAS_PMU */ #include static inline struct platform_device * -reserve_pmu(enum arm_pmu_type type) +reserve_pmu(enum arm_pmu_type device) { return ERR_PTR(-ENODEV); } static inline int -release_pmu(enum arm_pmu_type type) +release_pmu(struct platform_device *pdev) { return -ENODEV; } static inline int -init_pmu(enum arm_pmu_type type) +init_pmu(enum arm_pmu_type device) { return -ENODEV; } diff --git a/trunk/arch/arm/kernel/calls.S b/trunk/arch/arm/kernel/calls.S index 9943e9e74a1b..80f7896cc016 100644 --- a/trunk/arch/arm/kernel/calls.S +++ b/trunk/arch/arm/kernel/calls.S @@ -178,7 +178,7 @@ CALL(sys_ni_syscall) /* vm86 */ CALL(sys_ni_syscall) /* was sys_query_module */ CALL(sys_poll) - CALL(sys_ni_syscall) /* was nfsservctl */ + CALL(sys_nfsservctl) /* 170 */ CALL(sys_setresgid16) CALL(sys_getresgid16) CALL(sys_prctl) diff --git a/trunk/arch/arm/kernel/pmu.c b/trunk/arch/arm/kernel/pmu.c index c53474fe84df..2b70709376c3 100644 --- a/trunk/arch/arm/kernel/pmu.c +++ b/trunk/arch/arm/kernel/pmu.c @@ -31,7 +31,7 @@ static int __devinit pmu_register(struct platform_device *pdev, { if (type < 0 || type >= ARM_NUM_PMU_DEVICES) { pr_warning("received registration request for unknown " - "PMU device type %d\n", type); + "device %d\n", type); return -EINVAL; } @@ -112,17 +112,17 @@ static int __init register_pmu_driver(void) device_initcall(register_pmu_driver); struct platform_device * -reserve_pmu(enum arm_pmu_type type) +reserve_pmu(enum arm_pmu_type device) { struct platform_device *pdev; - if (test_and_set_bit_lock(type, &pmu_lock)) { + if (test_and_set_bit_lock(device, &pmu_lock)) { pdev = ERR_PTR(-EBUSY); - } else if (pmu_devices[type] == NULL) { - clear_bit_unlock(type, &pmu_lock); + } else if (pmu_devices[device] == NULL) { + clear_bit_unlock(device, &pmu_lock); pdev = ERR_PTR(-ENODEV); } else { - pdev = pmu_devices[type]; + pdev = pmu_devices[device]; } return pdev; @@ -130,11 +130,11 @@ reserve_pmu(enum arm_pmu_type type) EXPORT_SYMBOL_GPL(reserve_pmu); int -release_pmu(enum arm_pmu_type type) +release_pmu(enum arm_pmu_type device) { - if (WARN_ON(!pmu_devices[type])) + if (WARN_ON(!pmu_devices[device])) return -EINVAL; - clear_bit_unlock(type, &pmu_lock); + clear_bit_unlock(device, &pmu_lock); return 0; } EXPORT_SYMBOL_GPL(release_pmu); @@ -182,17 +182,17 @@ init_cpu_pmu(void) } int -init_pmu(enum arm_pmu_type type) +init_pmu(enum arm_pmu_type device) { int err = 0; - switch (type) { + switch (device) { case ARM_PMU_DEVICE_CPU: err = init_cpu_pmu(); break; default: - pr_warning("attempt to initialise PMU of unknown " - "type %d\n", type); + pr_warning("attempt to initialise unknown device %d\n", + device); err = -EINVAL; } diff --git a/trunk/arch/arm/kernel/relocate_kernel.S b/trunk/arch/arm/kernel/relocate_kernel.S index d0cdedf4864d..9cf4cbf8f95b 100644 --- a/trunk/arch/arm/kernel/relocate_kernel.S +++ b/trunk/arch/arm/kernel/relocate_kernel.S @@ -57,8 +57,7 @@ relocate_new_kernel: mov r0,#0 ldr r1,kexec_mach_type ldr r2,kexec_boot_atags - ARM( mov pc, lr ) - THUMB( bx lr ) + mov pc,lr .align diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c index e514c76043b4..70bca649e925 100644 --- a/trunk/arch/arm/kernel/setup.c +++ b/trunk/arch/arm/kernel/setup.c @@ -280,19 +280,18 @@ static void __init cacheid_init(void) if (arch >= CPU_ARCH_ARMv6) { if ((cachetype & (7 << 29)) == 4 << 29) { /* ARMv7 register format */ - arch = CPU_ARCH_ARMv7; cacheid = CACHEID_VIPT_NONALIASING; if ((cachetype & (3 << 14)) == 1 << 14) cacheid |= CACHEID_ASID_TAGGED; + else if (cpu_has_aliasing_icache(CPU_ARCH_ARMv7)) + cacheid |= CACHEID_VIPT_I_ALIASING; + } else if (cachetype & (1 << 23)) { + cacheid = CACHEID_VIPT_ALIASING; } else { - arch = CPU_ARCH_ARMv6; - if (cachetype & (1 << 23)) - cacheid = CACHEID_VIPT_ALIASING; - else - cacheid = CACHEID_VIPT_NONALIASING; + cacheid = CACHEID_VIPT_NONALIASING; + if (cpu_has_aliasing_icache(CPU_ARCH_ARMv6)) + cacheid |= CACHEID_VIPT_I_ALIASING; } - if (cpu_has_aliasing_icache(arch)) - cacheid |= CACHEID_VIPT_I_ALIASING; } else { cacheid = CACHEID_VIVT; } diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index 01c186222f3b..2c277d40cee6 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -137,8 +137,8 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) clk->max_delta_ns = clockevent_delta2ns(0xffffffff, clk); clk->min_delta_ns = clockevent_delta2ns(0xf, clk); - clockevents_register_device(clk); - /* Make sure our local interrupt controller has this enabled */ gic_enable_ppi(clk->irq); + + clockevents_register_device(clk); } diff --git a/trunk/arch/arm/mach-at91/at91sam9261.c b/trunk/arch/arm/mach-at91/at91sam9261.c index 6c8e3b5f669f..d522b47e30b5 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261.c +++ b/trunk/arch/arm/mach-at91/at91sam9261.c @@ -157,7 +157,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), - CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), + CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/trunk/arch/arm/mach-ep93xx/include/mach/ts72xx.h index f1397a13e76b..0eabec62cd9d 100644 --- a/trunk/arch/arm/mach-ep93xx/include/mach/ts72xx.h +++ b/trunk/arch/arm/mach-ep93xx/include/mach/ts72xx.h @@ -6,7 +6,7 @@ * TS72xx memory map: * * virt phys size - * febff000 22000000 4K model number register (bits 0-2) + * febff000 22000000 4K model number register * febfe000 22400000 4K options register * febfd000 22800000 4K options register #2 * febf9000 10800000 4K TS-5620 RTC index register @@ -20,9 +20,6 @@ #define TS72XX_MODEL_TS7200 0x00 #define TS72XX_MODEL_TS7250 0x01 #define TS72XX_MODEL_TS7260 0x02 -#define TS72XX_MODEL_TS7300 0x03 -#define TS72XX_MODEL_TS7400 0x04 -#define TS72XX_MODEL_MASK 0x07 #define TS72XX_OPTIONS_PHYS_BASE 0x22400000 @@ -54,34 +51,19 @@ #ifndef __ASSEMBLY__ -static inline int ts72xx_model(void) -{ - return __raw_readb(TS72XX_MODEL_VIRT_BASE) & TS72XX_MODEL_MASK; -} - static inline int board_is_ts7200(void) { - return ts72xx_model() == TS72XX_MODEL_TS7200; + return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7200; } static inline int board_is_ts7250(void) { - return ts72xx_model() == TS72XX_MODEL_TS7250; + return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7250; } static inline int board_is_ts7260(void) { - return ts72xx_model() == TS72XX_MODEL_TS7260; -} - -static inline int board_is_ts7300(void) -{ - return ts72xx_model() == TS72XX_MODEL_TS7300; -} - -static inline int board_is_ts7400(void) -{ - return ts72xx_model() == TS72XX_MODEL_TS7400; + return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260; } static inline int is_max197_installed(void) diff --git a/trunk/arch/arm/mach-exynos4/clock.c b/trunk/arch/arm/mach-exynos4/clock.c index 1561b036a9bf..851dea018578 100644 --- a/trunk/arch/arm/mach-exynos4/clock.c +++ b/trunk/arch/arm/mach-exynos4/clock.c @@ -520,7 +520,7 @@ static struct clk init_clocks_off[] = { .ctrlbit = (1 << 21), }, { .name = "ac97", - .devname = "samsung-ac97", + .id = -1, .enable = exynos4_clk_ip_peril_ctrl, .ctrlbit = (1 << 27), }, { diff --git a/trunk/arch/arm/mach-exynos4/cpu.c b/trunk/arch/arm/mach-exynos4/cpu.c index 746d6fc6d397..2d8a40c9e6e5 100644 --- a/trunk/arch/arm/mach-exynos4/cpu.c +++ b/trunk/arch/arm/mach-exynos4/cpu.c @@ -24,13 +24,12 @@ #include #include #include +#include #include #include #include -#include #include -#include extern int combiner_init(unsigned int combiner_nr, void __iomem *base, unsigned int irq_start); @@ -129,11 +128,6 @@ static void exynos4_idle(void) local_irq_enable(); } -static void exynos4_sw_reset(void) -{ - __raw_writel(0x1, S5P_SWRESET); -} - /* * exynos4_map_io * @@ -247,8 +241,5 @@ int __init exynos4_init(void) /* set idle function */ pm_idle = exynos4_idle; - /* set sw_reset function */ - s5p_reset_hook = exynos4_sw_reset; - return sysdev_register(&exynos4_sysdev); } diff --git a/trunk/arch/arm/mach-exynos4/include/mach/irqs.h b/trunk/arch/arm/mach-exynos4/include/mach/irqs.h index f8952f8f3757..934d2a493982 100644 --- a/trunk/arch/arm/mach-exynos4/include/mach/irqs.h +++ b/trunk/arch/arm/mach-exynos4/include/mach/irqs.h @@ -80,8 +80,9 @@ #define IRQ_HSMMC3 IRQ_SPI(76) #define IRQ_DWMCI IRQ_SPI(77) -#define IRQ_MIPI_CSIS0 IRQ_SPI(78) -#define IRQ_MIPI_CSIS1 IRQ_SPI(80) +#define IRQ_MIPICSI0 IRQ_SPI(78) + +#define IRQ_MIPICSI1 IRQ_SPI(80) #define IRQ_ONENAND_AUDI IRQ_SPI(82) #define IRQ_ROTATOR IRQ_SPI(83) diff --git a/trunk/arch/arm/mach-exynos4/include/mach/regs-pmu.h b/trunk/arch/arm/mach-exynos4/include/mach/regs-pmu.h index cdf9b47c303c..fa49bbb8e7b0 100644 --- a/trunk/arch/arm/mach-exynos4/include/mach/regs-pmu.h +++ b/trunk/arch/arm/mach-exynos4/include/mach/regs-pmu.h @@ -29,8 +29,6 @@ #define S5P_USE_STANDBY_WFE1 (1 << 25) #define S5P_USE_MASK ((0x3 << 16) | (0x3 << 24)) -#define S5P_SWRESET S5P_PMUREG(0x0400) - #define S5P_WAKEUP_STAT S5P_PMUREG(0x0600) #define S5P_EINT_WAKEUP_MASK S5P_PMUREG(0x0604) #define S5P_WAKEUP_MASK S5P_PMUREG(0x0608) diff --git a/trunk/arch/arm/mach-exynos4/irq-eint.c b/trunk/arch/arm/mach-exynos4/irq-eint.c index badb8c66fc9b..9d87d2ac7f68 100644 --- a/trunk/arch/arm/mach-exynos4/irq-eint.c +++ b/trunk/arch/arm/mach-exynos4/irq-eint.c @@ -23,8 +23,6 @@ #include -#include - static DEFINE_SPINLOCK(eint_lock); static unsigned int eint0_15_data[16]; @@ -186,11 +184,8 @@ static inline void exynos4_irq_demux_eint(unsigned int start) static void exynos4_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc) { - struct irq_chip *chip = irq_get_chip(irq); - chained_irq_enter(chip, desc); exynos4_irq_demux_eint(IRQ_EINT(16)); exynos4_irq_demux_eint(IRQ_EINT(24)); - chained_irq_exit(chip, desc); } static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc) @@ -198,7 +193,6 @@ static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc) u32 *irq_data = irq_get_handler_data(irq); struct irq_chip *chip = irq_get_chip(irq); - chained_irq_enter(chip, desc); chip->irq_mask(&desc->irq_data); if (chip->irq_ack) @@ -207,7 +201,6 @@ static void exynos4_irq_eint0_15(unsigned int irq, struct irq_desc *desc) generic_handle_irq(*irq_data); chip->irq_unmask(&desc->irq_data); - chained_irq_exit(chip, desc); } int __init exynos4_init_irq_eint(void) diff --git a/trunk/arch/arm/mach-exynos4/mach-universal_c210.c b/trunk/arch/arm/mach-exynos4/mach-universal_c210.c index b3b5d8911004..0e280d12301e 100644 --- a/trunk/arch/arm/mach-exynos4/mach-universal_c210.c +++ b/trunk/arch/arm/mach-exynos4/mach-universal_c210.c @@ -79,7 +79,7 @@ static struct s3c2410_uartcfg universal_uartcfgs[] __initdata = { }; static struct regulator_consumer_supply max8952_consumer = - REGULATOR_SUPPLY("vdd_arm", NULL); + REGULATOR_SUPPLY("vddarm", NULL); static struct max8952_platform_data universal_max8952_pdata __initdata = { .gpio_vid0 = EXYNOS4_GPX0(3), @@ -105,7 +105,7 @@ static struct max8952_platform_data universal_max8952_pdata __initdata = { }; static struct regulator_consumer_supply lp3974_buck1_consumer = - REGULATOR_SUPPLY("vdd_int", NULL); + REGULATOR_SUPPLY("vddint", NULL); static struct regulator_consumer_supply lp3974_buck2_consumer = REGULATOR_SUPPLY("vddg3d", NULL); diff --git a/trunk/arch/arm/mach-exynos4/setup-usb-phy.c b/trunk/arch/arm/mach-exynos4/setup-usb-phy.c index 39aca045f660..0883c1b824b9 100644 --- a/trunk/arch/arm/mach-exynos4/setup-usb-phy.c +++ b/trunk/arch/arm/mach-exynos4/setup-usb-phy.c @@ -82,7 +82,7 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev) rstcon &= ~(HOST_LINK_PORT_SWRST_MASK | PHY1_SWRST_MASK); writel(rstcon, EXYNOS4_RSTCON); - udelay(80); + udelay(50); clk_disable(otg_clk); clk_put(otg_clk); diff --git a/trunk/arch/arm/mach-footbridge/Kconfig b/trunk/arch/arm/mach-footbridge/Kconfig index c8e7afcf14ec..dc26fff22cf0 100644 --- a/trunk/arch/arm/mach-footbridge/Kconfig +++ b/trunk/arch/arm/mach-footbridge/Kconfig @@ -62,7 +62,6 @@ config ARCH_EBSA285_HOST config ARCH_NETWINDER bool "NetWinder" select CLKSRC_I8253 - select CLKEVT_I8253 select FOOTBRIDGE_HOST select ISA select ISA_DMA diff --git a/trunk/arch/arm/mach-footbridge/dc21285.c b/trunk/arch/arm/mach-footbridge/dc21285.c index 18c32a5541d9..1331fff51ae2 100644 --- a/trunk/arch/arm/mach-footbridge/dc21285.c +++ b/trunk/arch/arm/mach-footbridge/dc21285.c @@ -18,7 +18,6 @@ #include #include #include -#include