mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits) Documentation: update broken web addresses. fix comment typo "choosed" -> "chosen" hostap:hostap_hw.c Fix typo in comment Fix spelling contorller -> controller in comments Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault fs/Kconfig: Fix typo Userpace -> Userspace Removing dead MACH_U300_BS26 drivers/infiniband: Remove unnecessary casts of private_data fs/ocfs2: Remove unnecessary casts of private_data libfc: use ARRAY_SIZE scsi: bfa: use ARRAY_SIZE drm: i915: use ARRAY_SIZE drm: drm_edid: use ARRAY_SIZE synclink: use ARRAY_SIZE block: cciss: use ARRAY_SIZE comment typo fixes: charater => character fix comment typos concerning "challenge" arm: plat-spear: fix typo in kerneldoc reiserfs: typo comment fix update email address ...
This commit is contained in:
commit
3cfc2c42c1
310 changed files with 461 additions and 574 deletions
|
|
@ -1295,7 +1295,7 @@ int smsclient_sendrequest(struct smscore_client_t *client,
|
|||
EXPORT_SYMBOL_GPL(smsclient_sendrequest);
|
||||
|
||||
|
||||
/* old GPIO managments implementation */
|
||||
/* old GPIO managements implementation */
|
||||
int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin,
|
||||
struct smscore_config_gpio *pinconfig)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -805,7 +805,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
|
|||
/* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */
|
||||
spca504A_acknowledged_command(gspca_dev, 0x24,
|
||||
8, 3, 0x9e, 1);
|
||||
/* Twice sequencial need status 0xff->0x9e->0x9d */
|
||||
/* Twice sequential need status 0xff->0x9e->0x9d */
|
||||
spca504A_acknowledged_command(gspca_dev, 0x24,
|
||||
8, 3, 0x9e, 0);
|
||||
|
||||
|
|
@ -877,7 +877,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
|
|||
/* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */
|
||||
spca504A_acknowledged_command(gspca_dev, 0x24,
|
||||
8, 3, 0x9e, 1);
|
||||
/* Twice sequencial need status 0xff->0x9e->0x9d */
|
||||
/* Twice sequential need status 0xff->0x9e->0x9d */
|
||||
spca504A_acknowledged_command(gspca_dev, 0x24,
|
||||
8, 3, 0x9e, 0);
|
||||
spca504A_acknowledged_command(gspca_dev, 0x24,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* USB ViCam WebCam driver
|
||||
* Copyright (c) 2002 Joe Burks (jburks@wavicle.org),
|
||||
* Christopher L Cheney (ccheney@cheney.cx),
|
||||
* Pavel Machek (pavel@suse.cz),
|
||||
* Pavel Machek (pavel@ucw.cz),
|
||||
* John Tyner (jtyner@cs.ucr.edu),
|
||||
* Monroe Williams (monroe@pobox.com)
|
||||
*
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
* Copyright (C) 1997-2000 Jakub Jelinek (jakub@redhat.com)
|
||||
* Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
|
||||
* Copyright (C) 2001,2002 Andi Kleen, SuSE Labs
|
||||
* Copyright (C) 2003 Pavel Machek (pavel@suse.cz)
|
||||
* Copyright (C) 2003 Pavel Machek (pavel@ucw.cz)
|
||||
* Copyright (C) 2005 Philippe De Muyter (phdm@macqel.be)
|
||||
* Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ struct zoran {
|
|||
|
||||
struct mutex resource_lock; /* prevent evil stuff */
|
||||
|
||||
u8 initialized; /* flag if zoran has been correctly initalized */
|
||||
u8 initialized; /* flag if zoran has been correctly initialized */
|
||||
int user; /* number of current users */
|
||||
struct card_info card;
|
||||
struct tvnorm *timing;
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ zr36057_overlay (struct zoran *zr,
|
|||
zr->overlay_settings.format);
|
||||
|
||||
/* Start and length of each line MUST be 4-byte aligned.
|
||||
* This should be allready checked before the call to this routine.
|
||||
* This should be already checked before the call to this routine.
|
||||
* All error messages are internal driver checking only! */
|
||||
|
||||
/* video display top and bottom registers */
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ zr36050_pushit (struct zr36050 *ptr,
|
|||
|
||||
Could be variable, but until it's not needed it they are just fixed to save
|
||||
memory. Otherwise expand zr36050 structure with arrays, push the values to
|
||||
it and initalize from there, as e.g. the linux zr36057/60 driver does it.
|
||||
it and initialize from there, as e.g. the linux zr36057/60 driver does it.
|
||||
========================================================================= */
|
||||
|
||||
static const char zr36050_dqt[0x86] = {
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ zr36060_pushit (struct zr36060 *ptr,
|
|||
|
||||
Could be variable, but until it's not needed it they are just fixed to save
|
||||
memory. Otherwise expand zr36060 structure with arrays, push the values to
|
||||
it and initalize from there, as e.g. the linux zr36057/60 driver does it.
|
||||
it and initialize from there, as e.g. the linux zr36057/60 driver does it.
|
||||
========================================================================= */
|
||||
|
||||
static const char zr36060_dqt[0x86] = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue