Linus Torvalds
8554cc18db
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ad714x - read the interrupt status registers in a row
Input: ad714x - use DMA-safe buffers for spi_write()
Input: ad714x - fix endianness issues
Input: ad714xx-spi - force SPI bus into the default 8-bit mode
Input: ep93xx_keypad - add missing include of linux/module.h
Input: tnetv107x-ts - add missing include of linux/module.h
Input: max11801_ts - correct license statement
Input: atmel_mxt_ts - report pressure information from the driver
Input: bcm5974 - Add support for newer MacBookPro8,2
Input: wacom - report id 3 returns 4 bytes of data
Input: wacom - add WAC_MSG_RETRIES define
Input: wacom - add support for the Wacom Bamboo Pen (CTL-660/K)
Input: tegra-kbc - correct call to input_free_device
Input: mpu3050 - correct call to input_free_device
Input: bcm5974 - add support for touchpads found in MacBookAir4,2
Input: mma8450 - fix module device table type
Input: remove CLOCK_TICK_RATE from analog joystick driver
2011-08-24 09:19:03 -07:00
Linus Torvalds
051732bcbe
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
fuse: mark pages accessed when written to
fuse: delete dead .write_begin and .write_end aops
fuse: fix flock
fuse: fix non-ANSI void function notation
2011-08-24 09:14:42 -07:00
Linus Torvalds
2983573e49
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
...
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Allow handling signals when stack is corrupted.
2011-08-24 09:13:40 -07:00
Fabio Estevam
d5534ba6c7
ARM: imx: Define functions for registering PATA
...
Define functions for registering PATA on MX27/MX31/MX35/MX53.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-08-24 18:13:34 +02:00
Linus Torvalds
2da2c664ec
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
bridge: fix a possible net_device leak
net: Documentation: RFC 2553bis is now RFC 3493
atm: br2684: Fix oops due to skb->dev being NULL
ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS
net: netdev-features.txt update to Documentation/networking/00-INDEX
vlan: reset headers on accel emulation path
forcedeth: call vlan_mode only if hw supports vlans
via-velocity: remove non-tagged packet filtering
bonding:reset backup and inactive flag of slave
net_sched: fix port mirror/redirect stats reporting
sit tunnels: propagate IPv6 transport class to IPv4 Type of Service
gianfar: reduce stack usage in gianfar_ethtool.c
net: minor update to Documentation/networking/scaling.txt
net: add missing entries to Documentation/networking/00-INDEX
gianfar: prevent buggy hw rx vlan tagging
net: sh_eth: Fix build by forgot including linux/interrupt.h
drivers/net/can/sja1000/plx_pci.c: eliminate double free
usbnet/cdc_ncm: Don't use stack variables for DMA
vmxnet3: Don't enable vlan filters in promiscuous mode.
iwlagn: sysfs couldn't find the priv pointer
...
2011-08-24 09:11:08 -07:00
Takashi Iwai
b9c5106cd2
ALSA: hda - Remove the rest of ALC662 quirks
...
The rest of ALC662 quirks are only for desktops, and they should work
with the auto-parser.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-08-24 18:08:07 +02:00
Takashi Iwai
a9b36153a4
ALSA: hda - Remove ALC662 ASUS eeepc-ep20 model quirk
...
Since the recent fixes, this device works with the auto-parser well.
Let's kill it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-08-24 18:05:06 +02:00
Takashi Iwai
c267468e98
ALSA: hda - Prefer multi-io to speakers for realtek auto-parser
...
When the multi-io jacks are available, parse them first and assign DACs
before parsing speakers and headphones. This allows a better chance of
surround I/O in some desktops and laptops with limited DACs.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-08-24 17:57:44 +02:00
Larry Finger
9de9f962c7
staging: rtl8192e: Convert typedefs that can be replaced with #define
...
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:55:49 -05:00
Larry Finger
e660594750
staging: rtl8192e: Convert typedef HT_AGGRE_SIZE_E to enum ht_aggre_size
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:55:33 -05:00
Larry Finger
d0df281309
staging: rtl8192e: Convert typedef RATR_TABLE_MODE_8192S to enum ratr_table_mode_8192s
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:09 -05:00
Larry Finger
74082c929d
staging: rtl8192e: Convert typedef FW_CMD_IO_TYPE to enum fw_cmd_io_type
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:08 -05:00
Larry Finger
472ba32655
staging: rtl8192e: Convert typedef SCAN_OPERATION_BACKUP_OPT to enum scan_op_backup_opt
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:08 -05:00
Larry Finger
569e595955
staging: rtl8192e: Convert typedef country_code_type_t to enum country_code_type
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:07 -05:00
Larry Finger
d45c88a63b
staging: rtl8192e: Convert typedef WOLPATTERN_TYPE to enum wol_pattern_type
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:06 -05:00
Larry Finger
de7c885a24
staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_state
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:04 -05:00
Larry Finger
f6ce577e38
staging: rtl8192e: Convert typedef RT_JOIN_ACTION to enum rt_join_action
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:03 -05:00
Larry Finger
8304cc64dc
staging: rtl8192e: Convert typedef IPS_CALLBACK_FUNCION to enum ips_callback_function
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:02 -05:00
Larry Finger
f6e3d4f4c2
staging: rtl8192e: Convert typedef RT_PS_MODE to enum rt_ps_mode
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:01 -05:00
Larry Finger
3c093c2ba1
staging: rtl8192e: Convert typedef Fsync_State to enum fsync_state
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:53:00 -05:00
Larry Finger
3b45eb8309
staging: rtl8192e: Convert typedef erp_t to enum erp_t
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:59 -05:00
Larry Finger
80f839d439
staging: rtl8192e: Convert typedef WIRELESS_NETWORK_TYPE to enum wireless_network_type
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:59 -05:00
Larry Finger
dc20a3265e
staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_mode
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:58 -05:00
Larry Finger
e608063303
staging: rtl8192e: Convert typedef RT_RF_TYPE_DEF to enum rt_rf_type_def
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:57 -05:00
Larry Finger
4fd7cedc51
staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_mode
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:56 -05:00
Larry Finger
062de0a9df
staging: rtl8192e: Convert typedef InitialGainOpType to enum init_gain_op_type
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:55 -05:00
Larry Finger
07276bac0f
staging: rtl8192e: Convert typedef BA_ACTION to enum ba_action
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:54 -05:00
Larry Finger
5a604053a9
staging: rtl8192e: Convert typedef TS_ACTION to enum ts_action
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:54 -05:00
Larry Finger
09ced23df6
staging: rtl8192e: Convert typedef ACT_CATEGORY to enum act_category
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:53 -05:00
Larry Finger
e93e0f6aab
staging: rtl8192e: Convert typedef RT_OP_MODE to enum rt_op_mode
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:52 -05:00
Larry Finger
bb5e482246
staging: rtl8192e: Convert typedef HW_VARIABLES to enum hw_variables
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:51 -05:00
Larry Finger
839370c572
staging: rtl8192e: Convert typedef HAL_DEF_VARIABLE to enum hal_def_variable
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:50 -05:00
Larry Finger
a3120de6c4
staging: rtl8192e: Convert typedef DM_DBG_E to enum dm_dbg
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:49 -05:00
Larry Finger
fe5cd9c21b
staging: rtl8192e: Convert typedef DM_CCK_Rx_Path_Method to enum dm_cck_rx_path_method
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:49 -05:00
Larry Finger
2fa7c96243
staging: rtl8192e: Convert typedef dm_dig_cs_ratio_e to enum dm_dig_cs_ratio
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:48 -05:00
Larry Finger
5d1703aee6
staging: rtl8192e: Convert typedef dm_dig_pd_th_e to enum dm_dig_pd_th
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:47 -05:00
Larry Finger
4777da736e
staging: rtl8192e: Convert typedef dm_dig_connect_e to enum dm_dig_connect
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:46 -05:00
Larry Finger
811ad0fdac
staging: rtl8192e: Convert typedef dm_dig_dbg_e to enum dm_dig_dbg
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:45 -05:00
Larry Finger
89cc54bc78
staging: rtl8192e: Convert typedef DM_DIG_EXT_PORT_ALG_E to enum dm_dig_ext_port_alg
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:44 -05:00
Larry Finger
defb880b7d
staging: rtl8192e: Convert typedef DM_DIG_TWO_PORT_ALG_E to enum dm_dig_two_port_alg
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:43 -05:00
Larry Finger
ba7b6556fd
staging: rtl8192e: Convert typedef dm_dig_alg_e to enum dm_dig_alg
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:43 -05:00
Larry Finger
3f67ad4e57
staging: rtl8192e: Convert typedef dm_dig_op_e to enum dm_dig_op_sta
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:42 -05:00
Larry Finger
a672b1f1df
staging: rtl8192e: Convert typedef dm_ratr_sta_e to enum dm_ratr_sta
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:41 -05:00
Larry Finger
3a74e8b369
staging: rtl8192e: Convert typedef dm_dig_sta_e to enum dm_dig_sta
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:40 -05:00
Larry Finger
85cdd997c8
staging: rtl8192e: Convert typedef DBGP_FLAG_E to enum dbgp_flag
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:39 -05:00
Larry Finger
ebc95dd01c
staging: rtl8192e: Convert typedef TWO_PORT_STATUS to enum two_port_status
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:38 -05:00
Larry Finger
2f4178151a
staging: rtl8192e: Convert typedef PCI_BRIDGE_VENDOR to enum pci_bridge_vendor
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:38 -05:00
Larry Finger
456419dbb3
staging: rtl8192e: Convert typedef IC_INFERIORITY_8192S to enum ic_inferiority_8192s
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:37 -05:00
Larry Finger
ab0d7ccaf7
staging: rtl8192e: Convert typedef RESET_TYPE to enum reset_type
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:36 -05:00
Larry Finger
ed8eac2f92
staging: rtl8192e: Convert typedef RT_CUSTOMER_ID to enum rt_customer_id
...
Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
2011-08-24 10:52:35 -05:00