Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6

Conflicts:
	net/ipv4/route.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index 4f902e1908aa..bebb8efea0a6 100644
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -24,6 +24,14 @@
 #ifndef _LINUX_WL12XX_H
 #define _LINUX_WL12XX_H
 
+/* The board reference clock values */
+enum {
+        WL12XX_REFCLOCK_19 = 0, /* 19.2 MHz */
+        WL12XX_REFCLOCK_26 = 1, /* 26 MHz */
+        WL12XX_REFCLOCK_38 = 2, /* 38.4 MHz */
+        WL12XX_REFCLOCK_54 = 3, /* 54 MHz */
+};
+
 struct wl12xx_platform_data {
         void (*set_power)(bool enable);
         /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */