Merge remote-tracking branch 'u-boot-sh/rmobile'

[karo-tx-uboot.git] / drivers / net / lan91c96.h

diff --git a/drivers/net/lan91c96.h b/drivers/net/lan91c96.h
index 6fbb0e3cbfa1c77f8a0ac06c8076c194743294bb..3e914ce5ad5d56f9d47cbd609da820e4db03b29a 100644 (file)
--- a/drivers/net/lan91c96.h
+++ b/drivers/net/lan91c96.h
@@ -8,19 +8,7 @@
  *       Developed by Simple Network Magic Corporation (SNMC)
  * Copyright (C) 1996 by Erik Stahlman (ES)
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * This file contains register information and access macros for
  * the LAN91C96 single chip ethernet controller.  It is a modified
@@ -68,15 +56,9 @@ typedef unsigned long int            dword;
 
 #define        SMC_IO_EXTENT   16
 
-#ifdef CONFIG_PXA250
+#ifdef CONFIG_CPU_PXA25X
 
-#ifdef CONFIG_LUBBOCK
-#define        SMC_IO_SHIFT    2
-#undef USE_32_BIT
-
-#else
 #define        SMC_IO_SHIFT    0
-#endif
 
 #define        SMCREG(edev, r) ((edev)->iobase+((r)<<SMC_IO_SHIFT))
 
@@ -146,7 +128,7 @@ typedef unsigned long int           dword;
                                        };  \
                                })
 
-#else /* if not CONFIG_PXA250 */
+#else /* if not CONFIG_CPU_PXA25X */
 
 /*
  * We have only 16 Bit PCMCIA access on Socket 0