Commit 0fd97ab4 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6

* 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Revert wrong fixes for common misspellings
parents 7fcaa9aa e9c54999
...@@ -314,7 +314,7 @@ static struct clk timer2_clk = { ...@@ -314,7 +314,7 @@ static struct clk timer2_clk = {
.name = "timer2", .name = "timer2",
.parent = &pll1_aux_clk, .parent = &pll1_aux_clk,
.lpsc = DAVINCI_LPSC_TIMER2, .lpsc = DAVINCI_LPSC_TIMER2,
.usecount = 1, /* REVISIT: why can't' this be disabled? */ .usecount = 1, /* REVISIT: why can't this be disabled? */
}; };
static struct clk timer3_clk = { static struct clk timer3_clk = {
......
...@@ -274,7 +274,7 @@ static struct clk timer2_clk = { ...@@ -274,7 +274,7 @@ static struct clk timer2_clk = {
.name = "timer2", .name = "timer2",
.parent = &pll1_aux_clk, .parent = &pll1_aux_clk,
.lpsc = DAVINCI_LPSC_TIMER2, .lpsc = DAVINCI_LPSC_TIMER2,
.usecount = 1, /* REVISIT: why can't' this be disabled? */ .usecount = 1, /* REVISIT: why can't this be disabled? */
}; };
static struct clk_lookup dm644x_clks[] = { static struct clk_lookup dm644x_clks[] = {
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
* *
* Obviously, the GART is not cache coherent and so any change to it * Obviously, the GART is not cache coherent and so any change to it
* must be flushed to memory (or maybe just make the GART space non * must be flushed to memory (or maybe just make the GART space non
* cachable). AGP memory itself does't seem to be cache coherent neither. * cachable). AGP memory itself doesn't seem to be cache coherent neither.
* *
* In order to invalidate the GART (which is probably necessary to inval * In order to invalidate the GART (which is probably necessary to inval
* the bridge internal TLBs), the following sequence has to be written, * the bridge internal TLBs), the following sequence has to be written,
......
...@@ -1799,7 +1799,7 @@ static int qib_6120_setup_reset(struct qib_devdata *dd) ...@@ -1799,7 +1799,7 @@ static int qib_6120_setup_reset(struct qib_devdata *dd)
/* /*
* Keep chip from being accessed until we are ready. Use * Keep chip from being accessed until we are ready. Use
* writeq() directly, to allow the write even though QIB_PRESENT * writeq() directly, to allow the write even though QIB_PRESENT
* isn't' set. * isn't set.
*/ */
dd->flags &= ~(QIB_INITTED | QIB_PRESENT); dd->flags &= ~(QIB_INITTED | QIB_PRESENT);
dd->int_counter = 0; /* so we check interrupts work again */ dd->int_counter = 0; /* so we check interrupts work again */
......
...@@ -2111,7 +2111,7 @@ static int qib_setup_7220_reset(struct qib_devdata *dd) ...@@ -2111,7 +2111,7 @@ static int qib_setup_7220_reset(struct qib_devdata *dd)
/* /*
* Keep chip from being accessed until we are ready. Use * Keep chip from being accessed until we are ready. Use
* writeq() directly, to allow the write even though QIB_PRESENT * writeq() directly, to allow the write even though QIB_PRESENT
* isn't' set. * isn't set.
*/ */
dd->flags &= ~(QIB_INITTED | QIB_PRESENT); dd->flags &= ~(QIB_INITTED | QIB_PRESENT);
dd->int_counter = 0; /* so we check interrupts work again */ dd->int_counter = 0; /* so we check interrupts work again */
......
...@@ -3299,7 +3299,7 @@ static int qib_do_7322_reset(struct qib_devdata *dd) ...@@ -3299,7 +3299,7 @@ static int qib_do_7322_reset(struct qib_devdata *dd)
/* /*
* Keep chip from being accessed until we are ready. Use * Keep chip from being accessed until we are ready. Use
* writeq() directly, to allow the write even though QIB_PRESENT * writeq() directly, to allow the write even though QIB_PRESENT
* isn't' set. * isn't set.
*/ */
dd->flags &= ~(QIB_INITTED | QIB_PRESENT | QIB_BADINTR); dd->flags &= ~(QIB_INITTED | QIB_PRESENT | QIB_BADINTR);
dd->flags |= QIB_DOING_RESET; dd->flags |= QIB_DOING_RESET;
......
...@@ -170,7 +170,7 @@ static int fmr2_setfreq(struct fmr2 *dev) ...@@ -170,7 +170,7 @@ static int fmr2_setfreq(struct fmr2 *dev)
return 0; return 0;
} }
/* !!! not tested, in my card this does't work !!! */ /* !!! not tested, in my card this doesn't work !!! */
static int fmr2_setvolume(struct fmr2 *dev) static int fmr2_setvolume(struct fmr2 *dev)
{ {
int vol[16] = { 0x021, 0x084, 0x090, 0x104, int vol[16] = { 0x021, 0x084, 0x090, 0x104,
......
...@@ -400,7 +400,7 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr) ...@@ -400,7 +400,7 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE); doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE);
doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE); doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
/* We can't' use dev_ready here, but at least we wait for the /* We can't use dev_ready here, but at least we wait for the
* command to complete * command to complete
*/ */
udelay(50); udelay(50);
......
...@@ -173,7 +173,7 @@ static int pcmcia_access_config(struct pcmcia_device *p_dev, ...@@ -173,7 +173,7 @@ static int pcmcia_access_config(struct pcmcia_device *p_dev,
c = p_dev->function_config; c = p_dev->function_config;
if (!(c->state & CONFIG_LOCKED)) { if (!(c->state & CONFIG_LOCKED)) {
dev_dbg(&p_dev->dev, "Configuration isn't't locked\n"); dev_dbg(&p_dev->dev, "Configuration isn't locked\n");
mutex_unlock(&s->ops_mutex); mutex_unlock(&s->ops_mutex);
return -EACCES; return -EACCES;
} }
......
...@@ -444,7 +444,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, ...@@ -444,7 +444,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd,
return (NDIS_STATUS_FAILURE); return (NDIS_STATUS_FAILURE);
} }
} }
/* Drop not U2M frames, can't's drop here because we will drop beacon in this case */ /* Drop not U2M frames, can't drop here because we will drop beacon in this case */
/* I am kind of doubting the U2M bit operation */ /* I am kind of doubting the U2M bit operation */
/* if (pRxD->U2M == 0) */ /* if (pRxD->U2M == 0) */
/* return(NDIS_STATUS_FAILURE); */ /* return(NDIS_STATUS_FAILURE); */
......
...@@ -860,7 +860,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, ...@@ -860,7 +860,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd,
DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n")); DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n"));
return NDIS_STATUS_FAILURE; return NDIS_STATUS_FAILURE;
} }
/* Drop not U2M frames, can't's drop here because we will drop beacon in this case */ /* Drop not U2M frames, can't drop here because we will drop beacon in this case */
/* I am kind of doubting the U2M bit operation */ /* I am kind of doubting the U2M bit operation */
/* if (pRxD->U2M == 0) */ /* if (pRxD->U2M == 0) */
/* return(NDIS_STATUS_FAILURE); */ /* return(NDIS_STATUS_FAILURE); */
......
...@@ -653,7 +653,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which) ...@@ -653,7 +653,7 @@ static int SBD_setup_device(struct spectra_nand_dev *dev, int which)
} }
dev->queue->queuedata = dev; dev->queue->queuedata = dev;
/* As Linux block layer does't support >4KB hardware sector, */ /* As Linux block layer doesn't support >4KB hardware sector, */
/* Here we force report 512 byte hardware sector size to Kernel */ /* Here we force report 512 byte hardware sector size to Kernel */
blk_queue_logical_block_size(dev->queue, 512); blk_queue_logical_block_size(dev->queue, 512);
......
...@@ -718,7 +718,7 @@ static void dload_symbols(struct dload_state *dlthis) ...@@ -718,7 +718,7 @@ static void dload_symbols(struct dload_state *dlthis)
* as a temporary for .dllview record construction. * as a temporary for .dllview record construction.
* Allocate storage for the whole table. Add 1 to the section count * Allocate storage for the whole table. Add 1 to the section count
* in case a trampoline section is auto-generated as well as the * in case a trampoline section is auto-generated as well as the
* size of the trampoline section name so DLLView does't get lost. * size of the trampoline section name so DLLView doesn't get lost.
*/ */
siz = sym_count * sizeof(struct local_symbol); siz = sym_count * sizeof(struct local_symbol);
......
...@@ -978,7 +978,7 @@ static void sx_change_speed(struct specialix_board *bp, ...@@ -978,7 +978,7 @@ static void sx_change_speed(struct specialix_board *bp,
spin_lock_irqsave(&bp->lock, flags); spin_lock_irqsave(&bp->lock, flags);
sx_out(bp, CD186x_CAR, port_No(port)); sx_out(bp, CD186x_CAR, port_No(port));
/* The Specialix board does't implement the RTS lines. /* The Specialix board doesn't implement the RTS lines.
They are used to set the IRQ level. Don't touch them. */ They are used to set the IRQ level. Don't touch them. */
if (sx_crtscts(tty)) if (sx_crtscts(tty))
port->MSVR = MSVR_DTR | (sx_in(bp, CD186x_MSVR) & MSVR_RTS); port->MSVR = MSVR_DTR | (sx_in(bp, CD186x_MSVR) & MSVR_RTS);
......
...@@ -718,7 +718,7 @@ struct btrfs_space_info { ...@@ -718,7 +718,7 @@ struct btrfs_space_info {
u64 total_bytes; /* total bytes in the space, u64 total_bytes; /* total bytes in the space,
this doesn't take mirrors into account */ this doesn't take mirrors into account */
u64 bytes_used; /* total bytes used, u64 bytes_used; /* total bytes used,
this does't take mirrors into account */ this doesn't take mirrors into account */
u64 bytes_pinned; /* total bytes pinned, will be freed when the u64 bytes_pinned; /* total bytes pinned, will be freed when the
transaction finishes */ transaction finishes */
u64 bytes_reserved; /* total bytes the allocator has reserved for u64 bytes_reserved; /* total bytes the allocator has reserved for
......
...@@ -1019,7 +1019,7 @@ struct ocfs2_xattr_entry { ...@@ -1019,7 +1019,7 @@ struct ocfs2_xattr_entry {
__le16 xe_name_offset; /* byte offset from the 1st entry in the __le16 xe_name_offset; /* byte offset from the 1st entry in the
local xattr storage(inode, xattr block or local xattr storage(inode, xattr block or
xattr bucket). */ xattr bucket). */
__u8 xe_name_len; /* xattr name len, does't include prefix. */ __u8 xe_name_len; /* xattr name len, doesn't include prefix. */
__u8 xe_type; /* the low 7 bits indicate the name prefix __u8 xe_type; /* the low 7 bits indicate the name prefix
* type and the highest bit indicates whether * type and the highest bit indicates whether
* the EA is stored in the local storage. */ * the EA is stored in the local storage. */
......
...@@ -667,7 +667,7 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); ...@@ -667,7 +667,7 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
MODULE_DESCRIPTION("L2TP over IP"); MODULE_DESCRIPTION("L2TP over IP");
MODULE_VERSION("1.0"); MODULE_VERSION("1.0");
/* Use the value of SOCK_DGRAM (2) directory, because __stringify does't like /* Use the value of SOCK_DGRAM (2) directory, because __stringify doesn't like
* enums * enums
*/ */
MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP); MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP);
...@@ -554,7 +554,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_send_failed( ...@@ -554,7 +554,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_send_failed(
memcpy(&ssf->ssf_info, &chunk->sinfo, sizeof(struct sctp_sndrcvinfo)); memcpy(&ssf->ssf_info, &chunk->sinfo, sizeof(struct sctp_sndrcvinfo));
/* Per TSVWG discussion with Randy. Allow the application to /* Per TSVWG discussion with Randy. Allow the application to
* resemble a fragmented message. * reassemble a fragmented message.
*/ */
ssf->ssf_info.sinfo_flags = chunk->chunk_hdr->flags; ssf->ssf_info.sinfo_flags = chunk->chunk_hdr->flags;
......
...@@ -170,7 +170,7 @@ static void tas_set_volume(struct tas *tas) ...@@ -170,7 +170,7 @@ static void tas_set_volume(struct tas *tas)
/* analysing the volume and mixer tables shows /* analysing the volume and mixer tables shows
* that they are similar enough when we shift * that they are similar enough when we shift
* the mixer table down by 4 bits. The error * the mixer table down by 4 bits. The error
* is minuscule, in just one item the error * is miniscule, in just one item the error
* is 1, at a value of 0x07f17b (mixer table * is 1, at a value of 0x07f17b (mixer table
* value is 0x07f17a) */ * value is 0x07f17a) */
tmp = tas_gaintable[left]; tmp = tas_gaintable[left];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment