Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6-omap-h63xx.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 0e1d24c2ed41deea2d2e05eb6e1eb3a26014bbe7..d24a47f80f9c67587df13a5a8b57282f7dd2e8dd 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -25,12 +25,7 @@
 #include <asm/atomic.h>
 #include <asm/device.h>
 
-#define DEVICE_NAME_SIZE       50
-/* DEVICE_NAME_HALF is really less than half to accommodate slop */
-#define DEVICE_NAME_HALF       __stringify(20)
-#define DEVICE_ID_SIZE         32
-#define BUS_ID_SIZE            KOBJ_NAME_LEN
-
+#define BUS_ID_SIZE            20
 
 struct device;
 struct device_driver;