refresh patches

[openwrt.git] / target / linux / adm5120 / files / include / asm-mips / mach-adm5120 / adm5120_board.h

diff --git a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_board.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_board.h
index 9f67bf3..c45b53f 100644 (file)
--- a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_board.h
+++ b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_board.h
@@ -1,29 +1,16 @@
 /*
 /*

- *  $Id$
- *

  *  ADM5120 board definitions
  *
  *  ADM5120 board definitions
  *

- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  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.
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>

  *
  *

- *  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.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.

  *
  *

- *  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., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.

  */
 
  */
 

-#ifndef _ADM5120_BOARD_H_
-#define _ADM5120_BOARD_H_
+#ifndef _ASM_MIPS_MACH_ADM5120_BOARD_H
+#define _ASM_MIPS_MACH_ADM5120_BOARD_H

 
 #include <linux/init.h>
 #include <linux/list.h>
 
 #include <linux/init.h>
 #include <linux/list.h>


@@ -35,35 +22,23 @@ struct adm5120_board {
        char                    name[ADM5120_BOARD_NAMELEN];
 
        void                    (*board_setup)(void);
        char                    name[ADM5120_BOARD_NAMELEN];
 
        void                    (*board_setup)(void);

-       void                    (*board_reset)(void);
-
-       unsigned int            eth_num_ports;
-       unsigned char           *eth_vlans;
-       unsigned int            num_devices;
-       struct platform_device  **devices;
-       unsigned int            pci_nr_irqs;
-       struct adm5120_pci_irq  *pci_irq_map;
-

        struct list_head        list;
 };
 
 extern void adm5120_board_register(struct adm5120_board *) __init;
 
        struct list_head        list;
 };
 
 extern void adm5120_board_register(struct adm5120_board *) __init;
 

-#define ADM5120_BOARD_START(_type, _name)                              \
-static struct adm5120_board adm5120_board_##_type __initdata;          \
+#define ADM5120_BOARD(_type, _name, _setup)                            \
+static struct adm5120_board adm5120_board_##_type __initdata = {       \
+       .mach_type      = _type,                                        \
+       .name           = _name,                                        \
+       .board_setup    = _setup,                                       \
+};                                                                     \

                                                                        \
 static __init int adm5120_board_##_type##_register(void)               \
 {                                                                      \
        adm5120_board_register(&adm5120_board_##_type);                 \
        return 0;                                                       \
 }                                                                      \
                                                                        \
 static __init int adm5120_board_##_type##_register(void)               \
 {                                                                      \
        adm5120_board_register(&adm5120_board_##_type);                 \
        return 0;                                                       \
 }                                                                      \

-pure_initcall(adm5120_board_##_type##_register);                       \
-                                                                       \
-static struct adm5120_board adm5120_board_##_type __initdata = {       \
-       .mach_type      = MACH_ADM5120_##_type,                         \
-       .name           = _name,
-
-#define ADM5120_BOARD_END                                              \
-};
+pure_initcall(adm5120_board_##_type##_register)

 
 

-#endif /* _ADM5120_BOARD_H_ */
+#endif /* _ASM_MIPS_MACH_ADM5120_BOARD_H */