Merge branch 'staging/for_v3.4' into v4l_for_linus

[~andy/linux] / drivers / staging / octeon / ethernet-defines.h

diff --git a/drivers/staging/octeon/ethernet-defines.h b/drivers/staging/octeon/ethernet-defines.h
index 6a2cd50a17dfe0e4f76747ea67d10f6285c597c2..bdaec8d2ca0c18f0562c76fb8fbaaa8e45d4aa2e 100644 (file)
--- a/drivers/staging/octeon/ethernet-defines.h
+++ b/drivers/staging/octeon/ethernet-defines.h
@@ -59,7 +59,7 @@
 #ifndef __ETHERNET_DEFINES_H__
 #define __ETHERNET_DEFINES_H__
 
-#include "cvmx-config.h"
+#include <asm/octeon/cvmx-config.h>
 
 
 #define OCTEON_ETHERNET_VERSION "1.9"