Merge master.kernel.org:/home/rmk/linux-2.6-arm

2006-01-12 12:23:49 -08:00
parent 8b87e1baff 00431707be
commit bf785ee0ae
37 changed files with 6114 additions and 135 deletions
@@ -67,6 +67,9 @@
 /* Parisc type numbers. */
 #define PORT_MUX	48

+/* Atmel AT91RM9200 SoC */
+#define PORT_AT91RM9200 49
+
 /* Macintosh Zilog type numbers */
 #define PORT_MAC_ZILOG	50	/* m68k : not yet implemented */
 #define PORT_PMAC_ZILOG	51