~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to arch/sh/boards/mach-se/7721/setup.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
 */
13
13
#include <linux/init.h>
14
14
#include <linux/platform_device.h>
 
15
#include <mach-se/mach/se7721.h>
 
16
#include <mach-se/mach/mrshpc.h>
15
17
#include <asm/machvec.h>
16
 
#include <mach-se/mach/se7721.h>
17
18
#include <asm/io.h>
18
19
#include <asm/heartbeat.h>
19
20
 
74
75
 
75
76
static int __init se7721_devices_setup(void)
76
77
{
77
 
        return platform_add_devices(se7721_devices,
78
 
                ARRAY_SIZE(se7721_devices));
 
78
        mrshpc_setup_windows();
 
79
        return platform_add_devices(se7721_devices, ARRAY_SIZE(se7721_devices));
79
80
}
80
81
device_initcall(se7721_devices_setup);
81
82