--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
-@@ -307,6 +307,9 @@ static int intel_opregion_video_event(st
+@@ -250,6 +250,9 @@ static int intel_opregion_video_event(st
struct acpi_bus_event *event = data;
int ret = NOTIFY_OK;
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -4009,9 +4009,14 @@ i915_gem_init_hw(struct drm_device *dev)
+@@ -4045,9 +4045,14 @@ i915_gem_init_hw(struct drm_device *dev)
drm_i915_private_t *dev_priv = dev->dev_private;
int ret;
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
-@@ -577,12 +577,21 @@ static bool radeon_acpi_vfct_bios(struct
+@@ -581,12 +581,21 @@ static bool radeon_acpi_vfct_bios(struct
{
bool ret = false;
struct acpi_table_header *hdr;
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
-@@ -654,7 +654,7 @@ static const struct net_device_ops mwifi
+@@ -668,7 +668,7 @@ static const struct net_device_ops mwifi
void mwifiex_init_priv_params(struct mwifiex_private *priv,
struct net_device *dev)
{
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
-@@ -76,7 +76,7 @@ void *wil_if_alloc(struct device *dev, v
+@@ -125,7 +125,7 @@ void *wil_if_alloc(struct device *dev, v
goto out_priv;
}
+#endif
};
- /**
+ module_pci_driver(atl1c_driver);
+#endif
};
- /**
+ struct atl1_stats {
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
-@@ -329,6 +329,7 @@ err:
+@@ -323,6 +323,7 @@ err:
return ret;
}
static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
unsigned char report_type)
{
-@@ -386,6 +387,16 @@ err:
+@@ -380,6 +381,16 @@ err:
mutex_unlock(&session->report_mutex);
return ret;
}
static void hidp_idle_timeout(unsigned long arg)
{
-@@ -674,6 +685,87 @@ static void hidp_close(struct hid_device
+@@ -668,6 +679,87 @@ static void hidp_close(struct hid_device
{
}
static int hidp_parse(struct hid_device *hid)
{
struct hidp_session *session = hid->driver_data;
-@@ -764,7 +856,9 @@ static int hidp_setup_hid(struct hidp_se
+@@ -758,7 +850,9 @@ static int hidp_setup_hid(struct hidp_se
hid->dev.parent = &session->conn->hcon->dev;
hid->ll_driver = &hidp_hid_driver;
hid->hid_output_raw_report = hidp_output_raw_report;
/* True if device is blacklisted in drivers/hid/hid-core.c */
-@@ -782,6 +876,7 @@ fault:
+@@ -776,6 +870,7 @@ fault:
return err;
}
/* initialize session devices */
static int hidp_session_dev_init(struct hidp_session *session,
-@@ -844,10 +939,17 @@ static int hidp_session_dev_add(struct h
+@@ -838,10 +933,17 @@ static int hidp_session_dev_add(struct h
/* remove HID/input devices from their bus systems */
static void hidp_session_dev_del(struct hidp_session *session)
{
func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
+#endif
- sdio_claim_host(func);
- ret = sdio_enable_func(func);
+ if (id->driver_data) {
+ struct mwifiex_sdio_device *data = (void *)id->driver_data;
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
-@@ -129,8 +129,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -140,8 +140,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
wait_for_completion(&adapter->fw_load);
if (user_rmmod) {
for (i = 0; i < adapter->priv_num; i++)
if ((GET_BSS_ROLE(adapter->priv[i]) ==
-@@ -147,6 +149,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -158,6 +160,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
kfree(card);
}
/*
* SDIO suspend.
*
-@@ -246,6 +249,7 @@ static int mwifiex_sdio_resume(struct de
+@@ -257,6 +260,7 @@ static int mwifiex_sdio_resume(struct de
return 0;
}
/* Device ID for SD8786 */
#define SDIO_DEVICE_ID_MARVELL_8786 (0x9116)
-@@ -264,10 +268,12 @@ static const struct sdio_device_id mwifi
+@@ -282,10 +286,12 @@ static const struct sdio_device_id mwifi
MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
static struct sdio_driver mwifiex_sdio = {
.name = "mwifiex_sdio",
-@@ -276,7 +282,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -294,7 +300,9 @@ static struct sdio_driver mwifiex_sdio =
.remove = mwifiex_sdio_remove,
.drv = {
.owner = THIS_MODULE,
/*
* patch for some L1 of old version,
-@@ -3640,6 +3644,14 @@ static int atl1_set_pauseparam(struct ne
+@@ -3615,6 +3619,14 @@ static int atl1_set_pauseparam(struct ne
return 0;
}
static void atl1_get_strings(struct net_device *netdev, u32 stringset,
u8 *data)
{
-@@ -3712,4 +3724,10 @@ static const struct ethtool_ops atl1_eth
+@@ -3687,6 +3699,12 @@ static const struct ethtool_ops atl1_eth
.nway_reset = atl1_nway_reset,
.get_ethtool_stats = atl1_get_ethtool_stats,
.get_sset_count = atl1_get_sset_count,
+ .set_tso = ethtool_op_set_tso,
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)) */
};
+
+ module_pci_driver(atl1_driver);
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
-@@ -369,8 +369,10 @@ void mwifiex_set_trans_start(struct net_
+@@ -366,8 +366,10 @@ void mwifiex_set_trans_start(struct net_
{
int i;
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
-@@ -1619,7 +1619,9 @@ static struct usb_driver btusb_driver =
+@@ -1620,7 +1620,9 @@ static struct usb_driver btusb_driver =
#endif
.id_table = btusb_table,
.supports_autosuspend = 1,
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1217,7 +1217,11 @@ static const struct file_operations fops
+@@ -1162,7 +1162,11 @@ static const struct file_operations fops
static struct dentry *create_buf_file_handler(const char *filename,
struct dentry *parent,
projects / openwrt / staging / blogic.git / commitdiff