xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Browse Source 
Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-03-28 04:21:18 +01:00
parent 6e15cf0486 5d80f8e5a9
commit 82268da1b1
408 changed files with 18152 additions and 6418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/wireless/arlan-main.c
View File

@@ -1030,7 +1030,17 @@ static int arlan_mac_addr(struct net_device *dev, void *p)
return 0;
}
static const struct net_device_ops arlan_netdev_ops = {
.ndo_open = arlan_open,
.ndo_stop = arlan_close,
.ndo_start_xmit = arlan_tx,
.ndo_get_stats = arlan_statistics,
.ndo_set_multicast_list = arlan_set_multicast,
.ndo_change_mtu = arlan_change_mtu,
.ndo_set_mac_address = arlan_mac_addr,
.ndo_tx_timeout = arlan_tx_timeout,
.ndo_validate_addr = eth_validate_addr,
};
static int __init arlan_setup_device(struct net_device *dev, int num)
{
@@ -1042,14 +1052,7 @@ static int __init arlan_setup_device(struct net_device *dev, int num)
ap->conf = (struct arlan_shmem *)(ap+1);
dev->tx_queue_len = tx_queue_len;
dev->open = arlan_open;
dev->stop = arlan_close;
dev->hard_start_xmit = arlan_tx;
dev->get_stats = arlan_statistics;
dev->set_multicast_list = arlan_set_multicast;
dev->change_mtu = arlan_change_mtu;
dev->set_mac_address = arlan_mac_addr;
dev->tx_timeout = arlan_tx_timeout;
dev->netdev_ops = &arlan_netdev_ops;
dev->watchdog_timeo = 3*HZ;
ap->irq_test_done = 0;