Merge git://git.infradead.org/battery-2.6

[mirror_ubuntu-zesty-kernel.git] / include / linux / isdn.h

diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 9cb2855bb170d34cd4e0b1c6b812312befb3c035..44cd663c53b60898bcdd82bc36f5ee5ed76622b6 100644 (file)
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -16,14 +16,8 @@
 
 #include <linux/ioctl.h>
 
-#ifdef CONFIG_COBALT_MICRO_SERVER
-/* Save memory */
-#define ISDN_MAX_DRIVERS    2
-#define ISDN_MAX_CHANNELS   8
-#else
 #define ISDN_MAX_DRIVERS    32
 #define ISDN_MAX_CHANNELS   64
-#endif
 
 /* New ioctl-codes */
 #define IIOCNETAIF  _IO('I',1)