mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
This commit is contained in:
commit
42933bac11
2463 changed files with 4249 additions and 4249 deletions
|
|
@ -306,7 +306,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
|
|||
case HID_GLOBAL_ITEM_TAG_PUSH:
|
||||
|
||||
if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) {
|
||||
dbg_hid("global enviroment stack overflow\n");
|
||||
dbg_hid("global environment stack overflow\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
|
|||
case HID_GLOBAL_ITEM_TAG_POP:
|
||||
|
||||
if (!parser->global_stack_ptr) {
|
||||
dbg_hid("global enviroment stack underflow\n");
|
||||
dbg_hid("global environment stack underflow\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ static const struct hid_usage_entry hid_usage_table[] = {
|
|||
{ 0x85, 0x83, "DesignCapacity" },
|
||||
{ 0x85, 0x85, "ManufacturerDate" },
|
||||
{ 0x85, 0x89, "iDeviceChemistry" },
|
||||
{ 0x85, 0x8b, "Rechargable" },
|
||||
{ 0x85, 0x8b, "Rechargeable" },
|
||||
{ 0x85, 0x8f, "iOEMInformation" },
|
||||
{ 0x85, 0x8d, "CapacityGranularity1" },
|
||||
{ 0x85, 0xd0, "ACPresent" },
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state fie
|
|||
* This is true when single_touch_id is equal to NO_TOUCHES. If multiple touches
|
||||
* are down and the touch providing for single touch emulation is lifted,
|
||||
* single_touch_id is equal to SINGLE_TOUCH_UP. While single touch emulation is
|
||||
* occuring, single_touch_id corresponds with the tracking id of the touch used.
|
||||
* occurring, single_touch_id corresponds with the tracking id of the touch used.
|
||||
*/
|
||||
#define NO_TOUCHES -1
|
||||
#define SINGLE_TOUCH_UP -2
|
||||
|
|
|
|||
|
|
@ -1806,13 +1806,13 @@ static ssize_t picolcd_debug_flash_write(struct file *f, const char __user *u,
|
|||
/*
|
||||
* Notes:
|
||||
* - concurrent writing is prevented by mutex and all writes must be
|
||||
* n*64 bytes and 64-byte aligned, each write being preceeded by an
|
||||
* n*64 bytes and 64-byte aligned, each write being preceded by an
|
||||
* ERASE which erases a 64byte block.
|
||||
* If less than requested was written or an error is returned for an
|
||||
* otherwise correct write request the next 64-byte block which should
|
||||
* have been written is in undefined state (mostly: original, erased,
|
||||
* (half-)written with write error)
|
||||
* - reading can happend without special restriction
|
||||
* - reading can happen without special restriction
|
||||
*/
|
||||
static const struct file_operations picolcd_debug_flash_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ enum kone_mouse_events {
|
|||
/* osd events are thought to be display on screen */
|
||||
kone_mouse_event_osd_dpi = 0xa0,
|
||||
kone_mouse_event_osd_profile = 0xb0,
|
||||
/* TODO clarify meaning and occurence of kone_mouse_event_calibration */
|
||||
/* TODO clarify meaning and occurrence of kone_mouse_event_calibration */
|
||||
kone_mouse_event_calibration = 0xc0,
|
||||
kone_mouse_event_call_overlong_macro = 0xe0,
|
||||
/* switch events notify if user changed values with mousebutton click */
|
||||
|
|
|
|||
Loading…
Reference in a new issue