← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/arm/mach-pxa/stargate2.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-pxa/stargate2.c
1001
1001
MACHINE_START(INTELMOTE2, "IMOTE 2")
1002
1002
        .map_io         = pxa27x_map_io,
1003
1003
        .init_irq       = pxa27x_init_irq,
 
1004
        .handle_irq     = pxa27x_handle_irq,
1004
1005
        .timer          = &pxa_timer,
1005
1006
        .init_machine   = imote2_init,
1006
 
        .boot_params    = 0xA0000100,
 
1007
        .atag_offset    = 0x100,
1007
1008
MACHINE_END
1008
1009
#endif
1009
1010
 
1012
1013
        .map_io = pxa27x_map_io,
1013
1014
        .nr_irqs = STARGATE_NR_IRQS,
1014
1015
        .init_irq = pxa27x_init_irq,
 
1016
        .handle_irq = pxa27x_handle_irq,
1015
1017
        .timer = &pxa_timer,
1016
1018
        .init_machine = stargate2_init,
1017
 
        .boot_params = 0xA0000100,
 
1019
        .atag_offset = 0x100,
1018
1020
MACHINE_END
1019
1021
#endif