1. 29 Jun, 2011 1 commit
  2. 28 Jun, 2011 32 commits
  3. 27 Jun, 2011 7 commits
    • Vitaliy Ivanov's avatar
      Fix some kernel-doc warnings · 4d258b25
      Vitaliy Ivanov authored
      Fix 'make htmldocs' warnings:
      
        Warning(/include/linux/hrtimer.h:153): No description found for parameter 'clockid'
        Warning(/include/linux/device.h:604): Excess struct/union/enum/typedef member 'of_match' description in 'device'
        Warning(/include/net/sock.h:349): Excess struct/union/enum/typedef member 'sk_rmem_alloc' description in 'sock'
      Signed-off-by: default avatarVitaliy Ivanov <vitalivanov@gmail.com>
      Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4d258b25
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · a64227b0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
        mmc: queue: bring discard_granularity/alignment into line with SCSI
        mmc: queue: append partition subname to queue thread name
        mmc: core: make erase timeout calculation allow for gated clock
        mmc: block: switch card to User Data Area when removing the block driver
        mmc: sdio: reset card during power_restore
        mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
        mmc: sdhi: DMA slave ID 0 is invalid
        mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling
        mmc: omap_hsmmc: use original sg_len for dma_unmap_sg
        mmc: omap_hsmmc: fix ocr mask usage
        mmc: sdio: fix runtime PM path during driver removal
        mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader
        mmc: sdhi: fix module unloading
        mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c
        mmc: vub300: fix null dereferences in error handling
      a64227b0
    • Greg Kroah-Hartman's avatar
      Staging: comedi: fix build breakages on some platforms · a73738e9
      Greg Kroah-Hartman authored
      Some platforms do not have virt_to_bus(), so properly depend on
      CONFIG_VIRT_TO_BUS for the Comedi drivers that need this function.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a73738e9
    • Greg Kroah-Hartman's avatar
      Staging: brcm80211: disable drivers except for X86 or MIPS platforms · d4620396
      Greg Kroah-Hartman authored
      As David points out, the driver is also broken on SPARC, so might
      as well just only enable it on platforms where people have reported it
      working, instead of trying to list all of the ones where it doesn't
      work, as the working platform list is much smaller...
      Reported-by: default avatarDavid Miller <davem@davemloft.net>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Henry Ptasinski <henryp@broadcom.com>
      Cc: Brett Rudley <brudley@broadcom.com>
      Cc: Roland Vossen <rvossen@broadcom.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      d4620396
    • Greg Kroah-Hartman's avatar
      Staging: brcm80211: disable drivers for PPC platforms · 15e5201d
      Greg Kroah-Hartman authored
      Right now, bad things happen if you try to build these drivers for the
      PPC platform as it seems that the code only has been tested and built on
      the MIPS big endian platform.
      
      So disable it on the PPC32 and PPC64 platforms for now, hopefully this
      will be resolved in the future as I'm sure someone will want to use
      these chips with that platform someday.
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Henry Ptasinski <henryp@broadcom.com>
      Cc: Brett Rudley <brudley@broadcom.com>
      Cc: Roland Vossen <rvossen@broadcom.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      15e5201d
    • Geert Uytterhoeven's avatar
      Staging: iio: Make IIO depend on GENERIC_HARDIRQS · 928f9111
      Geert Uytterhoeven authored
      On m68k (which doesn't support generic hardirqs yet):
      
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trigger_poll’:
      drivers/staging/iio/industrialio-trigger.c:180: error: implicit declaration of function ‘generic_handle_irq’
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trigger_poll_chained’:
      drivers/staging/iio/industrialio-trigger.c:200: error: implicit declaration of function ‘handle_nested_irq’
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_release’:
      drivers/staging/iio/industrialio-trigger.c:379: error: implicit declaration of function ‘irq_modify_status’
      drivers/staging/iio/industrialio-trigger.c:382: error: implicit declaration of function ‘irq_set_chip’
      drivers/staging/iio/industrialio-trigger.c:384: error: implicit declaration of function ‘irq_set_handler’
      drivers/staging/iio/industrialio-trigger.c:388: error: implicit declaration of function ‘irq_free_descs’
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_subirqmask’:
      drivers/staging/iio/industrialio-trigger.c:402: error: implicit declaration of function ‘irq_data_get_irq_chip’
      drivers/staging/iio/industrialio-trigger.c:402: warning: initialization makes pointer from integer without a cast
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_trig_subirqunmask’:
      drivers/staging/iio/industrialio-trigger.c:411: warning: initialization makes pointer from integer without a cast
      drivers/staging/iio/industrialio-trigger.c: In function ‘iio_allocate_trigger’:
      drivers/staging/iio/industrialio-trigger.c:432: error: implicit declaration of function ‘irq_alloc_descs’
      drivers/staging/iio/industrialio-trigger.c:455: error: ‘handle_simple_irq’ undeclared (first use in this function)
      drivers/staging/iio/industrialio-trigger.c:455: error: (Each undeclared identifier is reported only once
      drivers/staging/iio/industrialio-trigger.c:455: error: for each function it appears in.)
      
      Hence IIO_TRIGGER should depend on GENERIC_HARDIRQS.
      But as IIO_TRIGGER and IIO_RING_BUFFER form a maze of dependencies and selects,
      just make the whole IIO subsystem depend on GENERIC_HARDIRQS.
      
      This dependency also covers !S390, so that one can be removed again.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      928f9111
    • Tomas Winkler's avatar
      Staging: mei: fix suspend failure · a534bb6e
      Tomas Winkler authored
      wait_event_interruptible_timeout return value was wrongly used.
      The remaining timeout was used as the error code.
      This fix translated wait_event_interruptible_timeout return value
      into error code that can be propagated.
      
      [10291.674121] pci_pm_suspend(): mei_pci_suspend+0x0/0x8b [mei] returns 2500
      It's thinkpad t400 with
      00:03.0 Communication controller [0780]: Intel Corporation Mobile 4 Series Chipset MEI Controller [8086:2a44] (rev 07)
      Reported-by: default avatarArkadiusz Miskiewicz <a.miskiewicz@gmail.com>
      Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a534bb6e