Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits) trivial: fix typo in aic7xxx comment trivial: fix comment typo in drivers/ata/pata_hpt37x.c trivial: typo in kernel-parameters.txt trivial: fix typo in tracing documentation trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c trivial: remove unnecessary semicolons trivial: Fix duplicated word "options" in comment trivial: kbuild: remove extraneous blank line after declaration of usage() trivial: improve help text for mm debug config options trivial: doc: hpfall: accept disk device to unload as argument trivial: doc: hpfall: reduce risk that hpfall can do harm trivial: SubmittingPatches: Fix reference to renumbered step trivial: fix typos "man[ae]g?ment" -> "management" trivial: media/video/cx88: add __init/__exit macros to cx88 drivers trivial: fix typo in CONFIG_DEBUG_FS in gcov doc trivial: fix missing printk space in amd_k7_smp_check trivial: fix typo s/ketymap/keymap/ in comment trivial: fix typo "to to" in multiple files trivial: fix typos in comments s/DGBU/DBGU/ ...
This commit is contained in:
@@ -1367,7 +1367,7 @@ int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level)
|
||||
&msg, sizeof(msg));
|
||||
}
|
||||
|
||||
/* new GPIO managment implementation */
|
||||
/* new GPIO management implementation */
|
||||
static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum,
|
||||
u32 *pGroupNum, u32 *pGroupCfg) {
|
||||
|
||||
|
@@ -657,12 +657,12 @@ struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
|
||||
extern void smscore_putbuffer(struct smscore_device_t *coredev,
|
||||
struct smscore_buffer_t *cb);
|
||||
|
||||
/* old GPIO managment */
|
||||
/* old GPIO management */
|
||||
int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin,
|
||||
struct smscore_config_gpio *pinconfig);
|
||||
int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level);
|
||||
|
||||
/* new GPIO managment */
|
||||
/* new GPIO management */
|
||||
extern int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum,
|
||||
struct smscore_gpio_config *pGpioConfig);
|
||||
extern int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum,
|
||||
|
@@ -46,7 +46,7 @@
|
||||
* Version 0.11: Converted to v4l2_device.
|
||||
*
|
||||
* Many things to do:
|
||||
* - Correct power managment of device (suspend & resume)
|
||||
* - Correct power management of device (suspend & resume)
|
||||
* - Add code for scanning and smooth tuning
|
||||
* - Add code for sensitivity value
|
||||
* - Correct mistakes
|
||||
|
@@ -1371,7 +1371,7 @@ static struct cx8802_driver cx8802_blackbird_driver = {
|
||||
.advise_release = cx8802_blackbird_advise_release,
|
||||
};
|
||||
|
||||
static int blackbird_init(void)
|
||||
static int __init blackbird_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
@@ -1384,7 +1384,7 @@ static int blackbird_init(void)
|
||||
return cx8802_register_driver(&cx8802_blackbird_driver);
|
||||
}
|
||||
|
||||
static void blackbird_fini(void)
|
||||
static void __exit blackbird_fini(void)
|
||||
{
|
||||
cx8802_unregister_driver(&cx8802_blackbird_driver);
|
||||
}
|
||||
|
@@ -1350,7 +1350,7 @@ static struct cx8802_driver cx8802_dvb_driver = {
|
||||
.advise_release = cx8802_dvb_advise_release,
|
||||
};
|
||||
|
||||
static int dvb_init(void)
|
||||
static int __init dvb_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
@@ -1363,7 +1363,7 @@ static int dvb_init(void)
|
||||
return cx8802_register_driver(&cx8802_dvb_driver);
|
||||
}
|
||||
|
||||
static void dvb_fini(void)
|
||||
static void __exit dvb_fini(void)
|
||||
{
|
||||
cx8802_unregister_driver(&cx8802_dvb_driver);
|
||||
}
|
||||
|
@@ -870,7 +870,7 @@ static struct pci_driver cx8802_pci_driver = {
|
||||
.remove = __devexit_p(cx8802_remove),
|
||||
};
|
||||
|
||||
static int cx8802_init(void)
|
||||
static int __init cx8802_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
@@ -883,7 +883,7 @@ static int cx8802_init(void)
|
||||
return pci_register_driver(&cx8802_pci_driver);
|
||||
}
|
||||
|
||||
static void cx8802_fini(void)
|
||||
static void __exit cx8802_fini(void)
|
||||
{
|
||||
pci_unregister_driver(&cx8802_pci_driver);
|
||||
}
|
||||
|
@@ -2113,7 +2113,7 @@ static struct pci_driver cx8800_pci_driver = {
|
||||
#endif
|
||||
};
|
||||
|
||||
static int cx8800_init(void)
|
||||
static int __init cx8800_init(void)
|
||||
{
|
||||
printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n",
|
||||
(CX88_VERSION_CODE >> 16) & 0xff,
|
||||
@@ -2126,7 +2126,7 @@ static int cx8800_init(void)
|
||||
return pci_register_driver(&cx8800_pci_driver);
|
||||
}
|
||||
|
||||
static void cx8800_fini(void)
|
||||
static void __exit cx8800_fini(void)
|
||||
{
|
||||
pci_unregister_driver(&cx8800_pci_driver);
|
||||
}
|
||||
|
@@ -56,7 +56,7 @@ int m5602_read_bridge(struct sd *sd, const u8 address, u8 *i2c_data)
|
||||
return (err < 0) ? err : 0;
|
||||
}
|
||||
|
||||
/* Writes a byte to to the m5602 */
|
||||
/* Writes a byte to the m5602 */
|
||||
int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data)
|
||||
{
|
||||
int err;
|
||||
|
Reference in New Issue
Block a user