Index: sys/arch/arm/xscale/pxa2x0_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_com.c,v
retrieving revision 1.10
diff -u -r1.10 pxa2x0_com.c
--- sys/arch/arm/xscale/pxa2x0_com.c	14 Mar 2008 15:09:09 -0000	1.10
+++ sys/arch/arm/xscale/pxa2x0_com.c	12 Sep 2008 06:02:52 -0000
@@ -103,8 +103,9 @@
 	case PXA2X0_HWUART_BASE:
 		if (pxa->pxa_intr != PXA2X0_INT_HWUART)
 			return (0);
-		gpioconf = CPU_IS_PXA250 ? pxa25x_com_hwuart_gpioconf :
-			    pxa27x_com_hwuart_gpioconf;
+		if (CPU_IS_PXA270)
+			return (0);
+		gpioconf = pxa25x_com_hwuart_gpioconf;
 		break;
 
 	default:
Index: sys/arch/arm/xscale/pxa2x0_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_gpio.c,v
retrieving revision 1.10
diff -u -r1.10 pxa2x0_gpio.c
--- sys/arch/arm/xscale/pxa2x0_gpio.c	24 Apr 2008 11:46:30 -0000	1.10
+++ sys/arch/arm/xscale/pxa2x0_gpio.c	12 Sep 2008 06:02:52 -0000
@@ -853,10 +853,6 @@
 	{  -1 }
 };
 
-struct pxa2x0_gpioconf pxa27x_com_hwuart_gpioconf[] = {
-	{  -1 }
-};
-
 struct pxa2x0_gpioconf pxa27x_com_stuart_gpioconf[] = {
 	{  46, GPIO_CLR | GPIO_ALT_FN_2_IN },	/* STD_RXD */
 	{  47, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* STD_TXD */
@@ -886,15 +882,16 @@
 	{  55, GPIO_CLR | GPIO_ALT_FN_2_OUT },	/* nPREG */
 	{  56, GPIO_CLR | GPIO_ALT_FN_1_IN },	/* nPWAIT */
 	{  57, GPIO_CLR | GPIO_ALT_FN_1_IN },	/* nIOIS16 */
-	{ 104, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* pSKTSEL */
 
 #if 0	/* We can select and/or. */
+	{  79, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* pSKTSEL */
 	{  85, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* nPCE1 */
 	{  86, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* nPCE1 */
 	{ 102, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* nPCE1 */
 
 	{  54, GPIO_CLR | GPIO_ALT_FN_2_OUT },	/* nPCE2 */
 	{  78, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* nPCE2 */
+	{ 104, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* pSKTSEL */
 	{ 105, GPIO_CLR | GPIO_ALT_FN_1_OUT },	/* nPCE2 */
 #endif
 
Index: sys/arch/arm/xscale/pxa2x0_gpio.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_gpio.h,v
retrieving revision 1.4
diff -u -r1.4 pxa2x0_gpio.h
--- sys/arch/arm/xscale/pxa2x0_gpio.h	24 Jun 2008 20:19:05 -0000	1.4
+++ sys/arch/arm/xscale/pxa2x0_gpio.h	12 Sep 2008 06:02:52 -0000
@@ -87,7 +87,6 @@
 extern struct pxa2x0_gpioconf pxa27x_com_ffuart_gpioconf[];
 extern struct pxa2x0_gpioconf pxa27x_com_stuart_gpioconf[];
 extern struct pxa2x0_gpioconf pxa27x_com_btuart_gpioconf[];
-extern struct pxa2x0_gpioconf pxa27x_com_hwuart_gpioconf[];
 extern struct pxa2x0_gpioconf pxa27x_i2c_gpioconf[];
 extern struct pxa2x0_gpioconf pxa27x_i2s_gpioconf[];
 extern struct pxa2x0_gpioconf pxa27x_pcic_gpioconf[];
Index: sys/arch/zaurus/zaurus/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/zaurus/zaurus/machdep.c,v
retrieving revision 1.9
diff -u -r1.9 machdep.c
--- sys/arch/zaurus/zaurus/machdep.c	27 Apr 2008 18:58:47 -0000	1.9
+++ sys/arch/zaurus/zaurus/machdep.c	12 Sep 2008 06:02:59 -0000
@@ -285,6 +285,8 @@
 	{  44, GPIO_ALT_FN_1_IN },	/* BTCST */
 	{  45, GPIO_ALT_FN_2_OUT },	/* BTRST */
 
+	{ 104, GPIO_ALT_FN_1_OUT },	/* pSKTSEL */
+
 	{ 109, GPIO_ALT_FN_1_IN },	/* MMDAT<1> */
 	{ 110, GPIO_ALT_FN_1_IN },	/* MMDAT<2>/MMCCS<0> */
 	{ 111, GPIO_ALT_FN_1_IN },	/* MMDAT<3>/MMCCS<1> */