1. 20 1月, 2012 2 次提交
  2. 18 1月, 2012 2 次提交
  3. 17 1月, 2012 32 次提交
  4. 16 1月, 2012 4 次提交
    • L
      menuconfig: fix a regression when canceling the prompt dialog at exit · 30c4eaaf
      Li Zefan 提交于
      This commit fixes a bug, while introducing a new one..
      
      commit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2
      Author: Wang YanQing <udknight@gmail.com>
      Date:   Thu Jan 12 11:31:32 2012 +0800
      
          menuconfig: let make not report error when not save configuration
      
      Pressing ESC should cancel the yes/no dialog and return back to
      the main menu, but not exit from menuconfig.
      Signed-off-by: NLi Zefan <lizf@cn.fujitsu.com>
      Acked-by: NWang YanQing <udknight@gmail.com>
      Signed-off-by: NMichal Marek <mmarek@suse.cz>
      30c4eaaf
    • O
      ARM: OMAP3: fix build on !CONFIG_IOMMU_API · 1a51a0ce
      Ohad Ben-Cohen 提交于
      omap3isp depends on CONFIG_IOMMU_API, so avoid registering its
      device (and defining its configuration structs) on !CONFIG_IOMMU_API.
      
      This is generally nice to have, but more importantly, it fixes:
      
      arch/arm/plat-omap/include/plat/iommu.h: In function 'dev_to_omap_iommu':
      arch/arm/plat-omap/include/plat/iommu.h:135: error: 'struct
      dev_archdata' has no member named 'iommu'
      arch/arm/mach-omap2/devices.c: In function 'omap3_init_camera':
      arch/arm/mach-omap2/devices.c:222: error: 'struct dev_archdata' has no
      member named 'iommu'
      make[1]: *** [arch/arm/mach-omap2/devices.o] Error 1
      make: *** [arch/arm/mach-omap2] Error 2
      
      Which happens because while setting up the omap3isp device we try
      to access the (now nonexistent) iommu member of dev_archdata.
      
      Compile tested with omap2plus_defconfig on today's:
      
      commit e343a895
      Merge: 06792c4d 193a667f
      Author: Linus Torvalds <torvalds@linux-foundation.org>
      Date:   Tue Jan 10 18:04:27 2012 -0800
      
          Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostReported-by: NGovindraj Raja <govindraj.raja@ti.com>
      Reported-by: NArik Nemtsov <arik@wizery.com>
      Signed-off-by: NOhad Ben-Cohen <ohad@wizery.com>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Joerg Roedel <Joerg.Roedel@amd.com>
      Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
      Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Acked-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NJoerg Roedel <joerg.roedel@amd.com>
      1a51a0ce
    • K
      error: implicit declaration of function 'module_flags_taint' · 53999bf3
      Kevin Winchester 提交于
      Recent changes to kernel/module.c caused the following compile
      error:
      
        kernel/module.c: In function ‘show_taint’:
        kernel/module.c:1024:2: error: implicit declaration of function ‘module_flags_taint’ [-Werror=implicit-function-declaration]
        cc1: some warnings being treated as errors
      
      Correct this error by moving the definition of module_flags_taint
      outside of the #ifdef CONFIG_MODULE_UNLOAD section.
      Signed-off-by: NKevin Winchester <kjwinchester@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      53999bf3
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 122804ec
      Linus Torvalds 提交于
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
        [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
        mb86a20s: Add a few more register settings at the init seq
        mb86a20s: Group registers into the same line
        [media] [PATCH] don't reset the delivery system on DTV_CLEAR
        [media] [BUG] it913x-fe fix typo error making SNR levels unstable
        [media] cx23885: Query the CX25840 during enum_input for status
        [media] cx25840: Add support for g_input_status
        [media] rc-videomate-m1f.c Rename to match remote controler name
        [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
        [media] convert drivers/media/* to use module_platform_driver()
        [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
        [media] Exynos4 JPEG codec v4l2 driver
        [media] doc: v4l: selection: choose pixels as units for selection rectangles
        [media] v4l: s5p-tv: mixer: fix setup of VP scaling
        [media] v4l: s5p-tv: mixer: add support for selection API
        [media] v4l: emulate old crop API using extended crop/compose API
        [media] doc: v4l: add documentation for selection API
        [media] doc: v4l: add binary images for selection API
        [media] v4l: add support for selection api
        [media] hd29l2: fix review findings
        ...
      122804ec