From 4948a39536441e88475467a9a3c7947afc65b833 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 23 Jan 2009 16:40:23 +0100 Subject: [PATCH] --- yaml --- r: 130084 b: refs/heads/master c: 03e4c49f847f23c62900424f65a62f76de5a7151 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 7 + .../sound/alsa/HD-Audio-Models.txt | 1 - trunk/arch/arm/plat-mxc/include/mach/ipu.h | 181 -- trunk/arch/arm/plat-mxc/include/mach/irqs.h | 10 +- trunk/arch/arm/plat-mxc/include/mach/mx3fb.h | 38 - trunk/arch/s390/include/asm/elf.h | 16 +- trunk/arch/sh/Kconfig | 63 +- trunk/arch/sh/boards/board-ap325rxa.c | 53 +- trunk/arch/sh/boards/board-magicpanelr2.c | 23 +- trunk/arch/sh/boards/board-sh7785lcr.c | 1 - trunk/arch/sh/boards/mach-highlander/setup.c | 1 - trunk/arch/sh/boards/mach-hp6xx/setup.c | 2 +- trunk/arch/sh/boards/mach-migor/setup.c | 171 +- .../arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- trunk/arch/sh/boards/mach-x3proto/setup.c | 1 - trunk/arch/sh/configs/ap325rxa_defconfig | 355 +--- trunk/arch/sh/configs/dreamcast_defconfig | 60 +- trunk/arch/sh/configs/edosk7705_defconfig | 18 +- trunk/arch/sh/configs/edosk7760_defconfig | 83 +- trunk/arch/sh/configs/hp6xx_defconfig | 88 +- trunk/arch/sh/configs/landisk_defconfig | 76 +- trunk/arch/sh/configs/lboxre2_defconfig | 63 +- trunk/arch/sh/configs/magicpanelr2_defconfig | 119 +- trunk/arch/sh/configs/microdev_defconfig | 63 +- trunk/arch/sh/configs/migor_defconfig | 95 +- trunk/arch/sh/configs/r7780mp_defconfig | 85 +- trunk/arch/sh/configs/r7785rp_defconfig | 130 +- trunk/arch/sh/configs/rsk7201_defconfig | 26 +- trunk/arch/sh/configs/rsk7203_defconfig | 88 +- trunk/arch/sh/configs/rts7751r2d1_defconfig | 87 +- .../arch/sh/configs/rts7751r2dplus_defconfig | 87 +- trunk/arch/sh/configs/sdk7780_defconfig | 101 +- trunk/arch/sh/configs/se7206_defconfig | 75 +- trunk/arch/sh/configs/se7343_defconfig | 61 +- trunk/arch/sh/configs/se7619_defconfig | 47 +- trunk/arch/sh/configs/se7705_defconfig | 60 +- trunk/arch/sh/configs/se7712_defconfig | 79 +- trunk/arch/sh/configs/se7721_defconfig | 85 +- trunk/arch/sh/configs/se7722_defconfig | 61 +- trunk/arch/sh/configs/se7750_defconfig | 61 +- trunk/arch/sh/configs/se7751_defconfig | 56 +- trunk/arch/sh/configs/se7780_defconfig | 87 +- trunk/arch/sh/configs/sh03_defconfig | 82 +- trunk/arch/sh/configs/sh7710voipgw_defconfig | 55 +- trunk/arch/sh/configs/sh7763rdp_defconfig | 71 +- trunk/arch/sh/configs/sh7785lcr_defconfig | 92 +- trunk/arch/sh/configs/shmin_defconfig | 54 +- trunk/arch/sh/configs/shx3_defconfig | 77 +- trunk/arch/sh/configs/snapgear_defconfig | 53 +- trunk/arch/sh/configs/systemh_defconfig | 50 +- trunk/arch/sh/configs/titan_defconfig | 90 +- trunk/arch/sh/configs/ul2_defconfig | 69 +- trunk/arch/sh/include/asm/posix_types_32.h | 8 +- trunk/arch/sh/include/asm/posix_types_64.h | 8 +- trunk/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 31 - trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- trunk/arch/sh/kernel/process_64.c | 2 + trunk/arch/sh/kernel/traps_32.c | 9 +- trunk/arch/sh/mm/ioremap_64.c | 2 +- trunk/arch/x86/include/asm/bitops.h | 14 +- trunk/arch/x86/include/asm/io.h | 1 + trunk/arch/x86/include/asm/msr-index.h | 29 - trunk/arch/x86/include/asm/pgalloc.h | 1 - trunk/arch/x86/include/asm/syscalls.h | 2 +- trunk/arch/x86/include/asm/timex.h | 13 +- trunk/arch/x86/kernel/apic.c | 9 - .../x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 35 +- trunk/arch/x86/kernel/cpu/intel.c | 13 - trunk/arch/x86/kernel/cpu/mtrr/generic.c | 12 +- trunk/arch/x86/kernel/hpet.c | 3 +- trunk/arch/x86/kernel/setup_percpu.c | 2 +- trunk/arch/x86/kernel/signal.c | 11 +- trunk/arch/x86/kernel/tlb_uv.c | 1 - trunk/arch/x86/kernel/vmi_32.c | 2 +- trunk/arch/x86/lib/usercopy_32.c | 4 +- trunk/arch/x86/lib/usercopy_64.c | 4 +- trunk/arch/x86/mm/init_32.c | 48 +- trunk/arch/x86/mm/init_64.c | 2 +- trunk/arch/x86/mm/iomap_32.c | 10 - trunk/arch/x86/mm/ioremap.c | 25 + trunk/arch/x86/mm/pageattr.c | 49 +- trunk/arch/x86/mm/pat.c | 43 +- trunk/drivers/dma/Kconfig | 19 - trunk/drivers/dma/Makefile | 1 - trunk/drivers/dma/dmaengine.c | 8 +- trunk/drivers/dma/dmatest.c | 35 +- trunk/drivers/dma/fsldma.c | 8 +- trunk/drivers/dma/ipu/Makefile | 1 - trunk/drivers/dma/ipu/ipu_idmac.c | 1740 ----------------- trunk/drivers/dma/ipu/ipu_intern.h | 176 -- trunk/drivers/dma/ipu/ipu_irq.c | 413 ---- trunk/drivers/gpu/drm/drm_agpsupport.c | 3 +- trunk/drivers/gpu/drm/drm_crtc.c | 14 +- trunk/drivers/gpu/drm/drm_drv.c | 4 - trunk/drivers/gpu/drm/drm_edid.c | 2 +- trunk/drivers/gpu/drm/drm_stub.c | 8 - trunk/drivers/gpu/drm/i915/i915_dma.c | 7 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 4 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 13 - trunk/drivers/ide/falconide.c | 2 +- trunk/drivers/ide/ide-probe.c | 3 +- trunk/drivers/ide/palm_bk3710.c | 11 +- trunk/drivers/oprofile/cpu_buffer.c | 5 - trunk/drivers/oprofile/cpu_buffer.h | 7 - trunk/drivers/pci/hotplug/pciehp_core.c | 4 +- trunk/drivers/pci/msi.c | 16 +- trunk/drivers/pci/pci-driver.c | 91 +- trunk/drivers/pci/pci.c | 63 +- trunk/drivers/pci/pci.h | 6 - trunk/drivers/serial/sh-sci.h | 5 +- trunk/drivers/video/Kconfig | 12 - trunk/drivers/video/Makefile | 1 - trunk/drivers/video/mx3fb.c | 1555 --------------- trunk/drivers/xen/balloon.c | 8 - trunk/drivers/xen/xenfs/xenbus.c | 11 +- trunk/fs/9p/Kconfig | 10 - trunk/fs/Kconfig | 1401 ++++++++++++- trunk/fs/adfs/Kconfig | 27 - trunk/fs/affs/Kconfig | 21 - trunk/fs/afs/Kconfig | 21 - trunk/fs/autofs/Kconfig | 21 - trunk/fs/autofs4/Kconfig | 20 - trunk/fs/befs/Kconfig | 26 - trunk/fs/bfs/Kconfig | 19 - trunk/fs/btrfs/Kconfig | 18 - trunk/fs/coda/Kconfig | 21 - trunk/fs/configfs/Kconfig | 11 - trunk/fs/cramfs/Kconfig | 19 - trunk/fs/ecryptfs/Kconfig | 11 - trunk/fs/efs/Kconfig | 14 - trunk/fs/fat/Kconfig | 97 - trunk/fs/freevxfs/Kconfig | 16 - trunk/fs/fuse/Kconfig | 15 - trunk/fs/fuse/dev.c | 16 +- trunk/fs/fuse/file.c | 2 +- trunk/fs/fuse/inode.c | 30 +- trunk/fs/hfs/Kconfig | 12 - trunk/fs/hfsplus/Kconfig | 13 - trunk/fs/hpfs/Kconfig | 14 - trunk/fs/isofs/Kconfig | 39 - trunk/fs/jfs/Kconfig | 49 - trunk/fs/minix/Kconfig | 17 - trunk/fs/ncpfs/Kconfig | 21 - trunk/fs/nfs/Kconfig | 86 - trunk/fs/nfsd/Kconfig | 80 - trunk/fs/notify/inotify/inotify_user.c | 135 +- trunk/fs/ntfs/Kconfig | 78 - trunk/fs/ocfs2/Kconfig | 85 - trunk/fs/omfs/Kconfig | 13 - trunk/fs/qnx4/Kconfig | 25 - trunk/fs/reiserfs/Kconfig | 85 - trunk/fs/romfs/Kconfig | 16 - trunk/fs/smbfs/Kconfig | 55 - trunk/fs/squashfs/Kconfig | 51 - trunk/fs/sysfs/Kconfig | 23 - trunk/fs/sysv/Kconfig | 36 - trunk/fs/udf/Kconfig | 18 - trunk/fs/ufs/Kconfig | 43 - trunk/fs/xfs/Kconfig | 1 - trunk/fs/xfs/linux-2.6/xfs_ioctl.c | 305 +-- trunk/fs/xfs/linux-2.6/xfs_ioctl.h | 15 +- trunk/fs/xfs/linux-2.6/xfs_ioctl32.c | 184 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 17 +- trunk/fs/xfs/quota/xfs_dquot.c | 38 +- trunk/fs/xfs/quota/xfs_dquot.h | 10 - trunk/fs/xfs/quota/xfs_qm.c | 9 - trunk/fs/xfs/xfs_ag.h | 6 +- trunk/fs/xfs/xfs_alloc_btree.c | 2 +- trunk/fs/xfs/xfs_attr.c | 26 +- trunk/fs/xfs/xfs_bmap.c | 166 +- trunk/fs/xfs/xfs_bmap.h | 2 + trunk/fs/xfs/xfs_bmap_btree.c | 10 +- trunk/fs/xfs/xfs_bmap_btree.h | 4 + trunk/fs/xfs/xfs_btree.c | 16 +- trunk/fs/xfs/xfs_da_btree.c | 8 +- trunk/fs/xfs/xfs_ialloc.c | 6 +- trunk/fs/xfs/xfs_ialloc.h | 2 + trunk/fs/xfs/xfs_ialloc_btree.h | 1 + trunk/fs/xfs/xfs_inode.c | 19 +- trunk/fs/xfs/xfs_inode_item.h | 4 + trunk/fs/xfs/xfs_iomap.c | 10 +- trunk/fs/xfs/xfs_itable.c | 6 +- trunk/fs/xfs/xfs_mount.c | 26 +- trunk/fs/xfs/xfs_mount.h | 9 +- trunk/fs/xfs/xfs_rename.c | 2 +- trunk/fs/xfs/xfs_rtalloc.c | 2 +- trunk/fs/xfs/xfs_rw.h | 1 + trunk/fs/xfs/xfs_sb.h | 2 +- trunk/fs/xfs/xfs_vnodeops.c | 20 +- trunk/include/asm-generic/bitops/__ffs.h | 2 +- trunk/include/asm-generic/bitops/__fls.h | 2 +- trunk/include/asm-generic/bitops/fls.h | 2 +- trunk/include/asm-generic/bitops/fls64.h | 4 +- trunk/include/drm/drm_crtc.h | 3 +- trunk/include/linux/dmaengine.h | 11 +- trunk/include/linux/init_task.h | 6 - trunk/include/linux/pci.h | 5 - trunk/include/linux/sched.h | 32 +- trunk/include/linux/workqueue.h | 12 - trunk/include/sound/soc-dapm.h | 2 +- trunk/init/Kconfig | 179 +- trunk/kernel/dma-coherent.c | 47 +- trunk/kernel/fork.c | 16 +- trunk/kernel/hrtimer.c | 4 +- trunk/kernel/posix-cpu-timers.c | 70 + trunk/kernel/rcuclassic.c | 2 +- trunk/kernel/rcutree.c | 2 +- trunk/kernel/relay.c | 4 +- trunk/kernel/sched_stats.h | 33 +- trunk/kernel/softlockup.c | 9 - trunk/kernel/sysctl.c | 2 +- trunk/kernel/time/tick-sched.c | 2 +- trunk/kernel/workqueue.c | 20 +- trunk/lib/Kconfig.debug | 22 +- trunk/mm/nommu.c | 20 +- trunk/net/sunrpc/Kconfig | 79 - trunk/sound/pci/Kconfig | 4 +- trunk/sound/pci/hda/patch_realtek.c | 2 - trunk/sound/pci/hda/patch_sigmatel.c | 54 +- trunk/sound/pci/oxygen/virtuoso.c | 3 +- trunk/sound/soc/atmel/atmel-pcm.c | 2 + trunk/sound/soc/fsl/mpc8610_hpcd.c | 18 +- 223 files changed, 3535 insertions(+), 9133 deletions(-) delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/ipu.h delete mode 100644 trunk/arch/arm/plat-mxc/include/mach/mx3fb.h delete mode 100644 trunk/drivers/dma/ipu/Makefile delete mode 100644 trunk/drivers/dma/ipu/ipu_idmac.c delete mode 100644 trunk/drivers/dma/ipu/ipu_intern.h delete mode 100644 trunk/drivers/dma/ipu/ipu_irq.c delete mode 100644 trunk/drivers/video/mx3fb.c delete mode 100644 trunk/fs/9p/Kconfig delete mode 100644 trunk/fs/adfs/Kconfig delete mode 100644 trunk/fs/affs/Kconfig delete mode 100644 trunk/fs/afs/Kconfig delete mode 100644 trunk/fs/autofs/Kconfig delete mode 100644 trunk/fs/autofs4/Kconfig delete mode 100644 trunk/fs/befs/Kconfig delete mode 100644 trunk/fs/bfs/Kconfig delete mode 100644 trunk/fs/btrfs/Kconfig delete mode 100644 trunk/fs/coda/Kconfig delete mode 100644 trunk/fs/configfs/Kconfig delete mode 100644 trunk/fs/cramfs/Kconfig delete mode 100644 trunk/fs/ecryptfs/Kconfig delete mode 100644 trunk/fs/efs/Kconfig delete mode 100644 trunk/fs/fat/Kconfig delete mode 100644 trunk/fs/freevxfs/Kconfig delete mode 100644 trunk/fs/fuse/Kconfig delete mode 100644 trunk/fs/hfs/Kconfig delete mode 100644 trunk/fs/hfsplus/Kconfig delete mode 100644 trunk/fs/hpfs/Kconfig delete mode 100644 trunk/fs/isofs/Kconfig delete mode 100644 trunk/fs/jfs/Kconfig delete mode 100644 trunk/fs/minix/Kconfig delete mode 100644 trunk/fs/nfs/Kconfig delete mode 100644 trunk/fs/nfsd/Kconfig delete mode 100644 trunk/fs/ntfs/Kconfig delete mode 100644 trunk/fs/ocfs2/Kconfig delete mode 100644 trunk/fs/omfs/Kconfig delete mode 100644 trunk/fs/qnx4/Kconfig delete mode 100644 trunk/fs/reiserfs/Kconfig delete mode 100644 trunk/fs/romfs/Kconfig delete mode 100644 trunk/fs/smbfs/Kconfig delete mode 100644 trunk/fs/squashfs/Kconfig delete mode 100644 trunk/fs/sysfs/Kconfig delete mode 100644 trunk/fs/sysv/Kconfig delete mode 100644 trunk/fs/udf/Kconfig delete mode 100644 trunk/fs/ufs/Kconfig delete mode 100644 trunk/net/sunrpc/Kconfig diff --git a/[refs] b/[refs] index 429aca4cea63..847361b6c511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 832fb4a01ca27ded735421de2b090f03e20039fc +refs/heads/master: 03e4c49f847f23c62900424f65a62f76de5a7151 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index d8362cf9909e..8511d3532c27 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -577,6 +577,9 @@ and is between 256 and 4096 characters. It is defined in the file a memory unit (amount[KMG]). See also Documentation/kdump/kdump.txt for a example. + cs4232= [HW,OSS] + Format: ,,,,, + cs89x0_dma= [HW,NET] Format: @@ -729,6 +732,10 @@ and is between 256 and 4096 characters. It is defined in the file Default value is 0. Value can be changed at runtime via /selinux/enforce. + es1371= [HW,OSS] + Format: ,[,[]] + See also header of sound/oss/es1371.c. + ether= [HW,NET] Ethernet cards parameters This option is obsoleted by the "netdev=" option, which has equivalent usage. See its documentation for details. diff --git a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt index 0f5d26bea80f..64eb1100eec1 100644 --- a/trunk/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/trunk/Documentation/sound/alsa/HD-Audio-Models.txt @@ -349,7 +349,6 @@ STAC92HD73* STAC92HD83* =========== ref Reference board - mic-ref Reference board with power managment for ports STAC9872 ======== diff --git a/trunk/arch/arm/plat-mxc/include/mach/ipu.h b/trunk/arch/arm/plat-mxc/include/mach/ipu.h deleted file mode 100644 index a9221f1cc1a0..000000000000 --- a/trunk/arch/arm/plat-mxc/include/mach/ipu.h +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (C) 2008 - * Guennadi Liakhovetski, DENX Software Engineering, - * - * Copyright (C) 2005-2007 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef _IPU_H_ -#define _IPU_H_ - -#include -#include - -/* IPU DMA Controller channel definitions. */ -enum ipu_channel { - IDMAC_IC_0 = 0, /* IC (encoding task) to memory */ - IDMAC_IC_1 = 1, /* IC (viewfinder task) to memory */ - IDMAC_ADC_0 = 1, - IDMAC_IC_2 = 2, - IDMAC_ADC_1 = 2, - IDMAC_IC_3 = 3, - IDMAC_IC_4 = 4, - IDMAC_IC_5 = 5, - IDMAC_IC_6 = 6, - IDMAC_IC_7 = 7, /* IC (sensor data) to memory */ - IDMAC_IC_8 = 8, - IDMAC_IC_9 = 9, - IDMAC_IC_10 = 10, - IDMAC_IC_11 = 11, - IDMAC_IC_12 = 12, - IDMAC_IC_13 = 13, - IDMAC_SDC_0 = 14, /* Background synchronous display data */ - IDMAC_SDC_1 = 15, /* Foreground data (overlay) */ - IDMAC_SDC_2 = 16, - IDMAC_SDC_3 = 17, - IDMAC_ADC_2 = 18, - IDMAC_ADC_3 = 19, - IDMAC_ADC_4 = 20, - IDMAC_ADC_5 = 21, - IDMAC_ADC_6 = 22, - IDMAC_ADC_7 = 23, - IDMAC_PF_0 = 24, - IDMAC_PF_1 = 25, - IDMAC_PF_2 = 26, - IDMAC_PF_3 = 27, - IDMAC_PF_4 = 28, - IDMAC_PF_5 = 29, - IDMAC_PF_6 = 30, - IDMAC_PF_7 = 31, -}; - -/* Order significant! */ -enum ipu_channel_status { - IPU_CHANNEL_FREE, - IPU_CHANNEL_INITIALIZED, - IPU_CHANNEL_READY, - IPU_CHANNEL_ENABLED, -}; - -#define IPU_CHANNELS_NUM 32 - -enum pixel_fmt { - /* 1 byte */ - IPU_PIX_FMT_GENERIC, - IPU_PIX_FMT_RGB332, - IPU_PIX_FMT_YUV420P, - IPU_PIX_FMT_YUV422P, - IPU_PIX_FMT_YUV420P2, - IPU_PIX_FMT_YVU422P, - /* 2 bytes */ - IPU_PIX_FMT_RGB565, - IPU_PIX_FMT_RGB666, - IPU_PIX_FMT_BGR666, - IPU_PIX_FMT_YUYV, - IPU_PIX_FMT_UYVY, - /* 3 bytes */ - IPU_PIX_FMT_RGB24, - IPU_PIX_FMT_BGR24, - /* 4 bytes */ - IPU_PIX_FMT_GENERIC_32, - IPU_PIX_FMT_RGB32, - IPU_PIX_FMT_BGR32, - IPU_PIX_FMT_ABGR32, - IPU_PIX_FMT_BGRA32, - IPU_PIX_FMT_RGBA32, -}; - -enum ipu_color_space { - IPU_COLORSPACE_RGB, - IPU_COLORSPACE_YCBCR, - IPU_COLORSPACE_YUV -}; - -/* - * Enumeration of IPU rotation modes - */ -enum ipu_rotate_mode { - /* Note the enum values correspond to BAM value */ - IPU_ROTATE_NONE = 0, - IPU_ROTATE_VERT_FLIP = 1, - IPU_ROTATE_HORIZ_FLIP = 2, - IPU_ROTATE_180 = 3, - IPU_ROTATE_90_RIGHT = 4, - IPU_ROTATE_90_RIGHT_VFLIP = 5, - IPU_ROTATE_90_RIGHT_HFLIP = 6, - IPU_ROTATE_90_LEFT = 7, -}; - -struct ipu_platform_data { - unsigned int irq_base; -}; - -/* - * Enumeration of DI ports for ADC. - */ -enum display_port { - DISP0, - DISP1, - DISP2, - DISP3 -}; - -struct idmac_video_param { - unsigned short in_width; - unsigned short in_height; - uint32_t in_pixel_fmt; - unsigned short out_width; - unsigned short out_height; - uint32_t out_pixel_fmt; - unsigned short out_stride; - bool graphics_combine_en; - bool global_alpha_en; - bool key_color_en; - enum display_port disp; - unsigned short out_left; - unsigned short out_top; -}; - -/* - * Union of initialization parameters for a logical channel. So far only video - * parameters are used. - */ -union ipu_channel_param { - struct idmac_video_param video; -}; - -struct idmac_tx_desc { - struct dma_async_tx_descriptor txd; - struct scatterlist *sg; /* scatterlist for this */ - unsigned int sg_len; /* tx-descriptor. */ - struct list_head list; -}; - -struct idmac_channel { - struct dma_chan dma_chan; - dma_cookie_t completed; /* last completed cookie */ - union ipu_channel_param params; - enum ipu_channel link; /* input channel, linked to the output */ - enum ipu_channel_status status; - void *client; /* Only one client per channel */ - unsigned int n_tx_desc; - struct idmac_tx_desc *desc; /* allocated tx-descriptors */ - struct scatterlist *sg[2]; /* scatterlist elements in buffer-0 and -1 */ - struct list_head free_list; /* free tx-descriptors */ - struct list_head queue; /* queued tx-descriptors */ - spinlock_t lock; /* protects sg[0,1], queue */ - struct mutex chan_mutex; /* protects status, cookie, free_list */ - bool sec_chan_en; - int active_buffer; - unsigned int eof_irq; - char eof_name[16]; /* EOF IRQ name for request_irq() */ -}; - -#define to_tx_desc(tx) container_of(tx, struct idmac_tx_desc, txd) -#define to_idmac_chan(c) container_of(c, struct idmac_channel, dma_chan) - -#endif diff --git a/trunk/arch/arm/plat-mxc/include/mach/irqs.h b/trunk/arch/arm/plat-mxc/include/mach/irqs.h index c02b8fc2d821..e06d3cb0ee11 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/irqs.h +++ b/trunk/arch/arm/plat-mxc/include/mach/irqs.h @@ -35,15 +35,7 @@ #define MXC_BOARD_IRQ_START (MXC_INTERNAL_IRQS + MXC_GPIO_IRQS) #define MXC_BOARD_IRQS 16 -#define MXC_IPU_IRQ_START (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS) - -#ifdef CONFIG_MX3_IPU_IRQS -#define MX3_IPU_IRQS CONFIG_MX3_IPU_IRQS -#else -#define MX3_IPU_IRQS 0 -#endif - -#define NR_IRQS (MXC_IPU_IRQ_START + MX3_IPU_IRQS) +#define NR_IRQS (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS) extern void imx_irq_set_priority(unsigned char irq, unsigned char prio); diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h b/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h deleted file mode 100644 index e391a76ca87d..000000000000 --- a/trunk/arch/arm/plat-mxc/include/mach/mx3fb.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008 - * Guennadi Liakhovetski, DENX Software Engineering, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __ASM_ARCH_MX3FB_H__ -#define __ASM_ARCH_MX3FB_H__ - -#include -#include - -/* Proprietary FB_SYNC_ flags */ -#define FB_SYNC_OE_ACT_HIGH 0x80000000 -#define FB_SYNC_CLK_INVERT 0x40000000 -#define FB_SYNC_DATA_INVERT 0x20000000 -#define FB_SYNC_CLK_IDLE_EN 0x10000000 -#define FB_SYNC_SHARP_MODE 0x08000000 -#define FB_SYNC_SWAP_RGB 0x04000000 -#define FB_SYNC_CLK_SEL_EN 0x02000000 - -/** - * struct mx3fb_platform_data - mx3fb platform data - * - * @dma_dev: pointer to the dma-device, used for dma-slave connection - * @mode: pointer to a platform-provided per mxc_register_fb() videomode - */ -struct mx3fb_platform_data { - struct device *dma_dev; - const char *name; - const struct fb_videomode *mode; - int num_modes; -}; - -#endif diff --git a/trunk/arch/s390/include/asm/elf.h b/trunk/arch/s390/include/asm/elf.h index d480f39d65e6..74d0bbb7d955 100644 --- a/trunk/arch/s390/include/asm/elf.h +++ b/trunk/arch/s390/include/asm/elf.h @@ -172,14 +172,14 @@ extern char elf_platform[]; #ifndef __s390x__ #define SET_PERSONALITY(ex) set_personality(PER_LINUX) #else /* __s390x__ */ -#define SET_PERSONALITY(ex) \ -do { \ - if (current->personality != PER_LINUX32) \ - set_personality(PER_LINUX); \ - if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ - set_thread_flag(TIF_31BIT); \ - else \ - clear_thread_flag(TIF_31BIT); \ +#define SET_PERSONALITY(ex) \ +do { \ + if (personality(current->personality) != PER_LINUX32) \ + set_personality(PER_LINUX); \ + if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ + set_thread_flag(TIF_31BIT); \ + else \ + clear_thread_flag(TIF_31BIT); \ } while (0) #endif /* __s390x__ */ diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index ebabe518e729..f32a5197128d 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -644,25 +644,66 @@ endmenu menu "Bus options" +# Even on SuperH devices which don't have an ISA bus, +# this variable helps the PCMCIA modules handle +# IRQ requesting properly -- Greg Banks. +# +# Though we're generally not interested in it when +# we're not using PCMCIA, so we make it dependent on +# PCMCIA outright. -- PFM. +config ISA + def_bool y + depends on PCMCIA && HD6446X_SERIES + help + Find out whether you have ISA slots on your motherboard. ISA is the + name of a bus system, i.e. the way the CPU talks to the other stuff + inside your box. Other bus systems are PCI, EISA, MicroChannel + (MCA) or VESA. ISA is an older system, now being displaced by PCI; + newer boards don't support it. If you have ISA, say Y, otherwise N. + +config EISA + bool + ---help--- + The Extended Industry Standard Architecture (EISA) bus was + developed as an open alternative to the IBM MicroChannel bus. + + The EISA bus provided some of the features of the IBM MicroChannel + bus while maintaining backward compatibility with cards made for + the older ISA bus. The EISA bus saw limited use between 1988 and + 1995 when it was made obsolete by the PCI bus. + + Say Y here if you are building a kernel for an EISA-based machine. + + Otherwise, say N. + +config MCA + bool + help + MicroChannel Architecture is found in some IBM PS/2 machines and + laptops. It is a bus system similar to PCI or ISA. See + (and especially the web page given + there) before attempting to build an MCA bus kernel. + +config SBUS + bool + config SUPERHYWAY tristate "SuperHyway Bus support" depends on CPU_SUBTYPE_SH4_202 config MAPLE - bool "Maple Bus support" - depends on SH_DREAMCAST - help - The Maple Bus is SEGA's serial communication bus for peripherals - on the Dreamcast. Without this bus support you won't be able to - get your Dreamcast keyboard etc to work, so most users - probably want to say 'Y' here, unless you are only using the - Dreamcast with a serial line terminal or a remote network - connection. + bool "Maple Bus support" + depends on SH_DREAMCAST + help + The Maple Bus is SEGA's serial communication bus for peripherals + on the Dreamcast. Without this bus support you won't be able to + get your Dreamcast keyboard etc to work, so most users + probably want to say 'Y' here, unless you are only using the + Dreamcast with a serial line terminal or a remote network + connection. source "arch/sh/drivers/pci/Kconfig" -source "drivers/pci/pcie/Kconfig" - source "drivers/pci/Kconfig" source "drivers/pcmcia/Kconfig" diff --git a/trunk/arch/sh/boards/board-ap325rxa.c b/trunk/arch/sh/boards/board-ap325rxa.c index caf4c33f4e84..1c67cba6e34f 100644 --- a/trunk/arch/sh/boards/board-ap325rxa.c +++ b/trunk/arch/sh/boards/board-ap325rxa.c @@ -18,10 +18,8 @@ #include #include #include -#include +#include #include -#include -#include #include #include #include