diff --git a/[refs] b/[refs] index 7b9f10bea7f6..a72716fc42aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 612a726faf8486fa48b34fa37115ce1e7421d383 +refs/heads/master: 97c12f85ac5e4ac2faee6cada014ac6205105b19 diff --git a/trunk/include/asm-generic/topology.h b/trunk/include/asm-generic/topology.h index 47766b30061a..88bada2ebc4b 100644 --- a/trunk/include/asm-generic/topology.h +++ b/trunk/include/asm-generic/topology.h @@ -47,13 +47,6 @@ #define pcibus_to_node(bus) ((void)(bus), -1) #endif -#ifndef pcibus_to_cpumask -#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ - CPU_MASK_ALL : \ - node_to_cpumask(pcibus_to_node(bus)) \ - ) -#endif - #ifndef cpumask_of_pcibus #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ cpu_all_mask : \