Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / arch / powerpc / include / asm / system.h

diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
index a6297c67c3d6ab4e0e4a81246342dbf282dedb27..6c294acac848145d868d9f936c5df5ca879b1920 100644 (file)
--- a/arch/powerpc/include/asm/system.h
+++ b/arch/powerpc/include/asm/system.h
@@ -515,11 +515,8 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
  * powers of 2 writes until it reaches sufficient alignment).
  *
  * Based on this we disable the IP header alignment in network drivers.
- * We also modify NET_SKB_PAD to be a cacheline in size, thus maintaining
- * cacheline alignment of buffers.
  */
 #define NET_IP_ALIGN   0
-#define NET_SKB_PAD    L1_CACHE_BYTES
 
 #define cmpxchg64(ptr, o, n)                                           \
   ({                                                                   \