/* * linux/include/asm-generic/topology.h * * Written by: Matthew Dobson, IBM Corporation * * Copyright (C) 2002, IBM Corp. * * All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or * NON INFRINGEMENT. See the GNU General Public License for more * details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Send feedback to */ #ifndef _ASM_GENERIC_TOPOLOGY_H #define _ASM_GENERIC_TOPOLOGY_H #ifndef CONFIG_NUMA /* Other architectures wishing to use this simple topology API should fill in the below functions as appropriate in their own file. */ #ifndef cpu_to_node #define cpu_to_node(cpu) ((void)(cpu),0) #endif #ifndef set_numa_node #define set_numa_node(node) #endif #ifndef set_cpu_numa_node #define set_cpu_numa_node(cpu, node) #endif #ifndef cpu_to_mem #define cpu_to_mem(cpu) ((void)(cpu),0) #endif #ifndef parent_node #define parent_node(node) ((void)(node),0) #endif #ifndef cpumask_of_node #define cpumask_of_node(node) ((void)node, cpu_online_mask) #endif #ifndef pcibus_to_node #define pcibus_to_node(bus) ((void)(bus), -1) #endif #ifndef cpumask_of_pcibus #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ cpu_all_mask : \ cpumask_of_node(pcibus_to_node(bus))) #endif #endif /* CONFIG_NUMA */ #if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES) #ifndef set_numa_mem #define set_numa_mem(node) #endif #ifndef set_cpu_numa_mem #define set_cpu_numa_mem(cpu, node) #endif #endif /* !CONFIG_NUMA || !CONFIG_HAVE_MEMORYLESS_NODES */ #endif /* _ASM_GENERIC_TOPOLOGY_H */ gi/linux/net-next.git/log/net/mac80211/rx.c'>
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorMarcel J.E. Mol <marcel@mesa.nl>2017-01-30 19:26:40 +0100
committerJohan Hovold <johan@kernel.org>2017-01-31 17:27:04 +0100
commitd07830db1bdb254e4b50d366010b219286b8c937 (patch)
tree354d7fca237fa3d7e7e63c2196eaa4e1086838ea /net/mac80211/rx.c
parent5d03a2fd2292e71936c4235885c35ccc3c94695b (diff)
USB: serial: pl2303: add ATEN device ID
Seems that ATEN serial-to-usb devices using pl2303 exist with different device ids. This patch adds a missing device ID so it is recognised by the driver. Signed-off-by: Marcel J.E. Mol <marcel@mesa.nl> Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'net/mac80211/rx.c')
f='/cgit.cgi/linux/net-next.git/commit/net/sunrpc/xprtrdma?h=nds-private-remove&id=618c808968852609d2d9f0e5cfc351a4807ef8d0'>618c808968852609d2d9f0e5cfc351a4807ef8d0 (diff)
Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus
Diffstat (limited to 'net/sunrpc/xprtrdma')