diff options
-rw-r--r-- | drivers/char/n_hdlc.c | 2 | ||||
-rw-r--r-- | drivers/net/tlan.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 2 | ||||
-rw-r--r-- | drivers/video/aty/radeon_base.c | 16 | ||||
-rw-r--r-- | fs/reiserfs/xattr.c | 4 | ||||
-rw-r--r-- | net/irda/iriap.c | 2 | ||||
-rw-r--r-- | scripts/kconfig/util.c | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c index c3660d8781a4..a133a62f3d55 100644 --- a/drivers/char/n_hdlc.c +++ b/drivers/char/n_hdlc.c | |||
@@ -562,7 +562,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data, | |||
562 | } /* end of n_hdlc_tty_receive() */ | 562 | } /* end of n_hdlc_tty_receive() */ |
563 | 563 | ||
564 | /** | 564 | /** |
565 | * n_hdlc_tty_read - Called to retreive one frame of data (if available) | 565 | * n_hdlc_tty_read - Called to retrieve one frame of data (if available) |
566 | * @tty - pointer to tty instance data | 566 | * @tty - pointer to tty instance data |
567 | * @file - pointer to open file object | 567 | * @file - pointer to open file object |
568 | * @buf - pointer to returned data buffer | 568 | * @buf - pointer to returned data buffer |
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index 942fae0f2130..c2506b56a186 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
@@ -2865,11 +2865,11 @@ void TLan_PhyMonitor( struct net_device *dev ) | |||
2865 | * for this device. | 2865 | * for this device. |
2866 | * phy The address of the PHY to be queried. | 2866 | * phy The address of the PHY to be queried. |
2867 | * reg The register whose contents are to be | 2867 | * reg The register whose contents are to be |
2868 | * retreived. | 2868 | * retrieved. |
2869 | * val A pointer to a variable to store the | 2869 | * val A pointer to a variable to store the |
2870 | * retrieved value. | 2870 | * retrieved value. |
2871 | * | 2871 | * |
2872 | * This function uses the TLAN's MII bus to retreive the contents | 2872 | * This function uses the TLAN's MII bus to retrieve the contents |
2873 | * of a given register on a PHY. It sends the appropriate info | 2873 | * of a given register on a PHY. It sends the appropriate info |
2874 | * and then reads the 16-bit register value from the MII bus via | 2874 | * and then reads the 16-bit register value from the MII bus via |
2875 | * the TLAN SIO register. | 2875 | * the TLAN SIO register. |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 773ea3eca086..da004dd025fb 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -714,7 +714,7 @@ typedef enum { | |||
714 | */ | 714 | */ |
715 | 715 | ||
716 | /* FTDI_SIO_GET_MODEM_STATUS */ | 716 | /* FTDI_SIO_GET_MODEM_STATUS */ |
717 | /* Retreive the current value of the modem status register */ | 717 | /* Retrieve the current value of the modem status register */ |
718 | 718 | ||
719 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0 | 719 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE 0xc0 |
720 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS | 720 | #define FTDI_SIO_GET_MODEM_STATUS_REQUEST FTDI_SIO_GET_MODEM_STATUS |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 4f01ccc02aa4..156db84cb363 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -594,7 +594,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo) | |||
594 | } | 594 | } |
595 | 595 | ||
596 | /* | 596 | /* |
597 | * Retreive PLL infos by different means (BIOS, Open Firmware, register probing...) | 597 | * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...) |
598 | */ | 598 | */ |
599 | static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) | 599 | static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) |
600 | { | 600 | { |
@@ -660,17 +660,17 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) | |||
660 | 660 | ||
661 | #ifdef CONFIG_PPC_OF | 661 | #ifdef CONFIG_PPC_OF |
662 | /* | 662 | /* |
663 | * Retreive PLL infos from Open Firmware first | 663 | * Retrieve PLL infos from Open Firmware first |
664 | */ | 664 | */ |
665 | if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) { | 665 | if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) { |
666 | printk(KERN_INFO "radeonfb: Retreived PLL infos from Open Firmware\n"); | 666 | printk(KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n"); |
667 | goto found; | 667 | goto found; |
668 | } | 668 | } |
669 | #endif /* CONFIG_PPC_OF */ | 669 | #endif /* CONFIG_PPC_OF */ |
670 | 670 | ||
671 | /* | 671 | /* |
672 | * Check out if we have an X86 which gave us some PLL informations | 672 | * Check out if we have an X86 which gave us some PLL informations |
673 | * and if yes, retreive them | 673 | * and if yes, retrieve them |
674 | */ | 674 | */ |
675 | if (!force_measure_pll && rinfo->bios_seg) { | 675 | if (!force_measure_pll && rinfo->bios_seg) { |
676 | u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30); | 676 | u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30); |
@@ -682,7 +682,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) | |||
682 | rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12); | 682 | rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12); |
683 | rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16); | 683 | rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16); |
684 | 684 | ||
685 | printk(KERN_INFO "radeonfb: Retreived PLL infos from BIOS\n"); | 685 | printk(KERN_INFO "radeonfb: Retrieved PLL infos from BIOS\n"); |
686 | goto found; | 686 | goto found; |
687 | } | 687 | } |
688 | 688 | ||
@@ -691,7 +691,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) | |||
691 | * probe them | 691 | * probe them |
692 | */ | 692 | */ |
693 | if (radeon_probe_pll_params(rinfo) == 0) { | 693 | if (radeon_probe_pll_params(rinfo) == 0) { |
694 | printk(KERN_INFO "radeonfb: Retreived PLL infos from registers\n"); | 694 | printk(KERN_INFO "radeonfb: Retrieved PLL infos from registers\n"); |
695 | goto found; | 695 | goto found; |
696 | } | 696 | } |
697 | 697 | ||
@@ -702,7 +702,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo) | |||
702 | 702 | ||
703 | found: | 703 | found: |
704 | /* | 704 | /* |
705 | * Some methods fail to retreive SCLK and MCLK values, we apply default | 705 | * Some methods fail to retrieve SCLK and MCLK values, we apply default |
706 | * settings in this case (200Mhz). If that really happne often, we could | 706 | * settings in this case (200Mhz). If that really happne often, we could |
707 | * fetch from registers instead... | 707 | * fetch from registers instead... |
708 | */ | 708 | */ |
@@ -2393,7 +2393,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev, | |||
2393 | rinfo->mapped_vram/1024); | 2393 | rinfo->mapped_vram/1024); |
2394 | 2394 | ||
2395 | /* | 2395 | /* |
2396 | * Map the BIOS ROM if any and retreive PLL parameters from | 2396 | * Map the BIOS ROM if any and retrieve PLL parameters from |
2397 | * the BIOS. We skip that on mobility chips as the real panel | 2397 | * the BIOS. We skip that on mobility chips as the real panel |
2398 | * values we need aren't in the ROM but in the BIOS image in | 2398 | * values we need aren't in the ROM but in the BIOS image in |
2399 | * memory. This is definitely not the best meacnism though, | 2399 | * memory. This is definitely not the best meacnism though, |
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 72e120798677..02091eaac0b4 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c | |||
@@ -115,8 +115,8 @@ static struct dentry *__get_xa_root(struct super_block *s) | |||
115 | } | 115 | } |
116 | 116 | ||
117 | /* Returns the dentry (or NULL) referring to the root of the extended | 117 | /* Returns the dentry (or NULL) referring to the root of the extended |
118 | * attribute directory tree. If it has already been retreived, it is used. | 118 | * attribute directory tree. If it has already been retrieved, it is used. |
119 | * Otherwise, we attempt to retreive it from disk. It may also return | 119 | * Otherwise, we attempt to retrieve it from disk. It may also return |
120 | * a pointer-encoded error. | 120 | * a pointer-encoded error. |
121 | */ | 121 | */ |
122 | static inline struct dentry *get_xa_root(struct super_block *s) | 122 | static inline struct dentry *get_xa_root(struct super_block *s) |
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index b8bb78af8b8a..254f90746900 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c | |||
@@ -364,7 +364,7 @@ static void iriap_disconnect_request(struct iriap_cb *self) | |||
364 | /* | 364 | /* |
365 | * Function iriap_getvaluebyclass (addr, name, attr) | 365 | * Function iriap_getvaluebyclass (addr, name, attr) |
366 | * | 366 | * |
367 | * Retreive all values from attribute in all objects with given class | 367 | * Retrieve all values from attribute in all objects with given class |
368 | * name | 368 | * name |
369 | */ | 369 | */ |
370 | int iriap_getvaluebyclass_request(struct iriap_cb *self, | 370 | int iriap_getvaluebyclass_request(struct iriap_cb *self, |
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index 1fa4c0b801b3..4556014f2f00 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c | |||
@@ -101,7 +101,7 @@ void str_printf(struct gstr *gs, const char *fmt, ...) | |||
101 | va_end(ap); | 101 | va_end(ap); |
102 | } | 102 | } |
103 | 103 | ||
104 | /* Retreive value of growable string */ | 104 | /* Retrieve value of growable string */ |
105 | const char *str_get(struct gstr *gs) | 105 | const char *str_get(struct gstr *gs) |
106 | { | 106 | { |
107 | return gs->s; | 107 | return gs->s; |