summaryrefslogtreecommitdiffstats
path: root/canconfig.c
diff options
context:
space:
mode:
Diffstat (limited to 'canconfig.c')
-rw-r--r--canconfig.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/canconfig.c b/canconfig.c
index a61501a..8fbd130 100644
--- a/canconfig.c
+++ b/canconfig.c
@@ -1,9 +1,7 @@
/*
* canutils/canconfig.c
*
- * Copyright (C) 2005
- *
- * - Marc Kleine-Budde, Pengutronix
+ * Copyright (C) 2005 Marc Kleine-Budde <mkl@pengutronix.de>, Pengutronix
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the version 2 of the GNU General Public License
@@ -33,12 +31,13 @@
#include <netinet/in.h>
#include <netinet/ether.h>
-#include "can.h"
-
+#include <socket-can/can.h>
+#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
-int s;
+#endif
+
+int s;
struct ifreq ifr;
struct speed_map {