summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-03-28 18:35:25 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2003-03-28 18:35:25 -0800
commitc03239b7c5af7aea4d90e2ec4d50666350c272d2 (patch)
tree7753e344dc362bcd1ef7400fbf09f16fc92e7d92 /include/linux
parentc87aba22cc9f67c20328b5c0cd1acbcd88515217 (diff)
parent267010269a84bd2a55c04265863ebb098b1cc83e (diff)
Merge bk://ldm.bkbits.net/linux-2.5-core
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 908d6b708fb7..8e06bdee0138 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -35,7 +35,7 @@
#define DEVICE_NAME_SIZE 50
#define DEVICE_NAME_HALF __stringify(20) /* Less than half to accommodate slop */
#define DEVICE_ID_SIZE 32
-#define BUS_ID_SIZE 16
+#define BUS_ID_SIZE 20
enum {