summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRob Herring <r.herring@freescale.com>2009-05-05 14:25:13 -0500
committerRob Herring <r.herring@freescale.com>2009-05-05 18:17:51 -0500
commitc096fc73812248072b8c62a071dfe565fa359983 (patch)
tree1b67d3591a8e9d009ca5fcf37d8de654f9cdf33f /include
parent4e9da5716840fa8458211b98191ccdebcec74a67 (diff)
ENGR00112199 Import EA 3780 release 4
This is from EA P4 release with the following changes: Ported to 2.6.28 UBI support is stock 2.6.28. USB is not integrated Regulator code is not yet ported. Removed 3700 specific files Fix copyrights Signed-off-by: Rob Herring <r.herring@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/major.h2
-rw-r--r--include/linux/serial_core.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/major.h b/include/linux/major.h
index 88249452b935..9c9d170d191f 100644
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -170,6 +170,8 @@
#define VIOTAPE_MAJOR 230
+#define LBA_MAJOR 240
+
#define BLOCK_EXT_MAJOR 259
#endif
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index c4acccde9aec..453a064cefc6 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -161,6 +161,9 @@
/* Freescale Semiconductor MXC fmaily */
#define PORT_MXC 84
+/* STMP37xx ports */
+#define PORT_STMP37xx 85
+
#ifdef __KERNEL__
#include <linux/compiler.h>